From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 17 Jun 2022 10:47:34 +0000 (+0200)
Subject: Wider margin around window edges
X-Git-Tag: v1.13.90~108^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c0600d5c11ab1f07bb05a58709dbd8151a81cc3;p=tigervnc.git

Wider margin around window edges

To conform with how e.g. GNOME sets its margins.
---

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 55b3ca08..a31b8a63 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -74,10 +74,10 @@ OptionsDialog::OptionsDialog()
   //        have any separator for the caption, which looks odd
 #ifdef WIN32
   navigation = new Fl_Navigation(-1, 0, w()+2,
-                                 h() - INNER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
+                                 h() - OUTER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
 #else
   navigation = new Fl_Navigation(-1, -1, w()+2,
-                                 h()+1 - INNER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
+                                 h()+1 - OUTER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
 #endif
   {
     int tx, ty, tw, th;
diff --git a/vncviewer/fltk/layout.h b/vncviewer/fltk/layout.h
index e555a11b..3799204e 100644
--- a/vncviewer/fltk/layout.h
+++ b/vncviewer/fltk/layout.h
@@ -40,7 +40,7 @@ static inline int gui_str_len(const char *str)
 
 /**** MARGINS ****/
 
-#define OUTER_MARGIN            10
+#define OUTER_MARGIN            15
 #define INNER_MARGIN            10
 
 /* Tighter grouping of related fields */