Browse Source

Merge pull request #1842 from cg2121/prev-prog-label-alignment

UI: Fix preview/program label alignment
Jim 6 years ago
parent
commit
cdcd45fe11
3 changed files with 10 additions and 5 deletions
  1. 6 3
      UI/forms/OBSBasic.ui
  2. 4 1
      UI/window-basic-main-transitions.cpp
  3. 0 1
      UI/window-basic-main.cpp

+ 6 - 3
UI/forms/OBSBasic.ui

@@ -67,13 +67,16 @@
         <item>
          <layout class="QVBoxLayout" name="previewTextLayout">
           <property name="spacing">
-           <number>4</number>
+           <number>0</number>
           </property>
           <item>
            <widget class="QLabel" name="previewLabel">
             <property name="text">
              <string>StudioMode.Preview</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+            </property>
            </widget>
           </item>
           <item>
@@ -113,7 +116,7 @@
      <x>0</x>
      <y>0</y>
      <width>1079</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -653,7 +656,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>80</width>
+           <width>64</width>
            <height>16</height>
           </rect>
          </property>

+ 4 - 1
UI/window-basic-main-transitions.cpp

@@ -1234,13 +1234,16 @@ void OBSBasic::SetPreviewProgramMode(bool enabled)
 		RefreshQuickTransitions();
 
 		programLabel = new QLabel(QTStr("StudioMode.Program"));
-		programLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+		programLabel->setSizePolicy(QSizePolicy::Preferred,
+				QSizePolicy::Preferred);
+		programLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
 		programLabel->setProperty("themeID", "previewProgramLabels");
 
 		programWidget = new QWidget();
 		programLayout = new QVBoxLayout();
 
 		programLayout->setContentsMargins(0, 0, 0, 0);
+		programLayout->setSpacing(0);
 
 		programLayout->addWidget(programLabel);
 		programLayout->addWidget(program);

+ 0 - 1
UI/window-basic-main.cpp

@@ -380,7 +380,6 @@ OBSBasic::OBSBasic(QWidget *parent)
 	QPoint newPos = curPos + statsDockPos;
 	statsDock->move(newPos);
 
-	ui->previewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 	ui->previewLabel->setProperty("themeID", "previewProgramLabels");
 
 	bool labels = config_get_bool(GetGlobalConfig(),