Screen.c: cleanup auto dpi handling

new code is easier to read

Screen.c: cleanup auto dpi handling
00d60a82 · Ulrich Sibiller · Mike Gabriel · 3a7c3759 · 00d60a82
Commit 00d60a82 authored May 26, 2020 by Ulrich Sibiller Committed by Mike Gabriel Oct 17, 2020
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Screen.c nx-X11/programs/Xserver/hw/nxagent/Screen.c +7 -4

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1332,14 +1332,17 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
                  rootDepth, (long unsigned int)defaultVisual);
    #endif

-    if ((monitorResolution < 1) && (nxagentAutoDPI == False))
+    if (monitorResolution < 1)
    {
-      monitorResolution = NXAGENT_DEFAULT_DPI;
-    }
-    else if ((monitorResolution < 1) && (nxagentAutoDPI == True))
+      if (nxagentAutoDPI)
      {
        monitorResolution = NXAGENT_AUTO_DPI;
      }
+      else
+      {
+        monitorResolution = NXAGENT_DEFAULT_DPI;
+      }
+    }

    if (!fbScreenInit(pScreen, pFrameBufferBits, nxagentOption(RootWidth), nxagentOption(RootHeight),
          monitorResolution, monitorResolution, PixmapBytePad(nxagentOption(RootWidth), rootDepth), bitsPerPixel))