[freetype2-demos] master d4964c0 2/2: [ftinspect] Adjust layout.

[Werner LEMBERG]

branch: master
commit d4964c061382e92c515c53410f6e3e11459ec2ce
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Adjust layout.
    
    * src/ftinspect.cpp (MainGUI::createLayout): Move size, dpi, and
    zoom stuff one row down.
    s/fontLayout/fontSizeLayout/.
    
    * src/ftinspect.h: Updated.
---
 ChangeLog         |   16 +++++++++++++---
 src/ftinspect.cpp |   34 +++++++++++++++++-----------------
 src/ftinspect.h   |    2 +-
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acf51f6..cc1e9b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,19 @@
-2016-05-01  Werner Lemberg  <address@hidden>
+2016-05-02  Werner Lemberg  <address@hidden>
+
+       [ftinspect] Adjust layout.
+
+       * src/ftinspect.cpp (MainGUI::createLayout): Move size, dpi, and
+       zoom stuff one row down.
+       s/fontLayout/fontSizeLayout/.
+
+       * src/ftinspect.h: Updated.
+
+2016-05-02  Werner Lemberg  <address@hidden>
 
        [ftinspect] Add DPI control.
 
-       * src/ftinspect.cpp: Add `unitsComboBox' to select between px and
-       pt.
+       * src/ftinspect.cpp (MainGUI::createLayout): Add `unitsComboBox' to
+       select between px and pt.
        Add `dpiLabel' and `dpiSpinBox' to select the DPI value.
        (MainGUI::checkUnits): New function.
        (MainGUI::createConnections, MainGUI::setDefaults): Updated.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 1ded29b..ea8b4f0 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -371,13 +371,6 @@ MainGUI::createLayout()
 
   navigationLayout = new QHBoxLayout;
   navigationLayout->setSpacing(0);
-  navigationLayout->addWidget(sizeLabel);
-  navigationLayout->addWidget(sizeDoubleSpinBox);
-  navigationLayout->addWidget(unitsComboBox);
-  navigationLayout->addSpacing(10); // XXX px
-  navigationLayout->addWidget(dpiLabel);
-  navigationLayout->addWidget(dpiSpinBox);
-  navigationLayout->addSpacing(10); // XXX px
   navigationLayout->addStretch(1);
   navigationLayout->addWidget(toStartButton);
   navigationLayout->addWidget(toM1000Button);
@@ -389,23 +382,30 @@ MainGUI::createLayout()
   navigationLayout->addWidget(toP100Button);
   navigationLayout->addWidget(toP1000Button);
   navigationLayout->addWidget(toEndButton);
-  navigationLayout->addSpacing(10); // XXX px
   navigationLayout->addStretch(1);
-  navigationLayout->addWidget(zoomLabel);
-  navigationLayout->addWidget(zoomSpinBox);
 
-  fontLayout = new QHBoxLayout;
-  fontLayout->addStretch(1);
-  fontLayout->addWidget(previousFontButton);
-  fontLayout->addStretch(1);
-  fontLayout->addWidget(nextFontButton);
-  fontLayout->addStretch(1);
+  fontSizeLayout = new QHBoxLayout;
+  fontSizeLayout->addWidget(sizeLabel);
+  fontSizeLayout->addWidget(sizeDoubleSpinBox);
+  fontSizeLayout->addWidget(unitsComboBox);
+  fontSizeLayout->addSpacing(10); // XXX px
+  fontSizeLayout->addWidget(dpiLabel);
+  fontSizeLayout->addWidget(dpiSpinBox);
+  fontSizeLayout->addSpacing(10); // XXX px
+  fontSizeLayout->addStretch(1);
+  fontSizeLayout->addWidget(previousFontButton);
+  fontSizeLayout->addStretch(1);
+  fontSizeLayout->addWidget(nextFontButton);
+  fontSizeLayout->addStretch(1);
+  fontSizeLayout->addSpacing(10); // XXX px
+  fontSizeLayout->addWidget(zoomLabel);
+  fontSizeLayout->addWidget(zoomSpinBox);
 
   rightLayout = new QVBoxLayout;
   rightLayout->addWidget(glyphView);
   rightLayout->addLayout(navigationLayout);
   rightLayout->addSpacing(10); // XXX px
-  rightLayout->addLayout(fontLayout);
+  rightLayout->addLayout(fontSizeLayout);
 
   // for symmetry with the left side use a widget also
   rightWidget = new QWidget;
diff --git a/src/ftinspect.h b/src/ftinspect.h
index 7110386..7c6185f 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -76,7 +76,7 @@ private:
   QGraphicsView *glyphView;
 
   QHBoxLayout *antiAliasingLayout;
-  QHBoxLayout *fontLayout;
+  QHBoxLayout *fontSizeLayout;
   QHBoxLayout *gammaLayout;
   QHBoxLayout *hintingModeLayout;
   QHBoxLayout *ftinspectLayout;