Size adjustments to improve Mac appearance.

telwertowski · telwertowski · commit 3ee93d0c24a6 · 2006-11-27T20:42:37.000Z
As much as possible, sizes for controls should be avoided so that each platform can choose its own preferred size. Mac fonts and controls tend to be a few pixels larger than X11. Using absolute numbers to tighten a layout on X11 often results in truncated or compressed items on a Mac. A QPushButton will not render correctly on a Mac for widths less than 60. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6138 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmeasure.cpp b/src/gui/qgsmeasure.cpp
@@ -31,6 +31,10 @@ QgsMeasure::QgsMeasure(bool measureArea, QgsMapCanvas *mc, Qt::WFlags f)
   : QDialog(mc->topLevelWidget(), f), QgsMapTool(mc)
 {
     setupUi(this);
+#ifdef Q_WS_MAC
+    // Mac buttons are larger than X11 and require a larger minimum width to be drawn correctly
+    frame4->setMinimumSize(QSize(224, 0));
+#endif
     connect(mRestartButton, SIGNAL(clicked()), this, SLOT(restart()));
     connect(mCloseButton, SIGNAL(clicked()), this, SLOT(close()));
 
diff --git a/src/ui/qgsmeasurebase.ui b/src/ui/qgsmeasurebase.ui
@@ -35,13 +35,8 @@
     <widget class="QLineEdit" name="editTotal" >
      <property name="font" >
       <font>
-       <family>Sans Serif</family>
-       <pointsize>9</pointsize>
        <weight>75</weight>
-       <italic>false</italic>
        <bold>true</bold>
-       <underline>false</underline>
-       <strikeout>false</strikeout>
       </font>
      </property>
      <property name="alignment" >
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -611,8 +611,8 @@ identifying features without zooming in very close.
         <widget class="QPushButton" name="btnFindBrowser" >
          <property name="maximumSize" >
           <size>
-           <width>21</width>
-           <height>21</height>
+           <width>60</width>
+           <height>32767</height>
           </size>
          </property>
          <property name="text" >
diff --git a/src/ui/qgspluginmanagerbase.ui b/src/ui/qgspluginmanagerbase.ui
@@ -47,7 +47,7 @@
       <widget class="QPushButton" name="btnBrowse" >
        <property name="maximumSize" >
         <size>
-         <width>30</width>
+         <width>60</width>
          <height>32767</height>
         </size>
        </property>
diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -120,12 +120,6 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
             <property name="maximum" >
              <number>255</number>
             </property>
@@ -608,12 +602,6 @@
           </property>
           <item row="0" column="3" >
            <widget class="QSpinBox" name="spinMaximumScale" >
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
             <property name="toolTip" >
              <string>Maximum scale at which this layer will be displayed. </string>
             </property>
@@ -637,12 +625,6 @@
           </item>
           <item row="0" column="1" >
            <widget class="QSpinBox" name="spinMinimumScale" >
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>12</height>
-             </size>
-            </property>
             <property name="toolTip" >
              <string>Minimum scale at which this layer will be displayed. </string>
             </property>
@@ -681,25 +663,13 @@
           </property>
           <item row="0" column="1" >
            <widget class="QPushButton" name="pbnChangeSpatialRefSys" >
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>12</height>
-             </size>
-            </property>
             <property name="text" >
              <string>Change</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0" >
            <widget class="QLineEdit" name="leSpatialRefSys" >
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
             <property name="readOnly" >
              <bool>true</bool>
             </property>
diff --git a/src/ui/qgsserversourceselectbase.ui b/src/ui/qgsserversourceselectbase.ui
@@ -269,7 +269,7 @@
      <property name="minimumSize" >
       <size>
        <width>16</width>
-       <height>60</height>
+       <height>64</height>
       </size>
      </property>
      <property name="title" >
