Browse Source

Merge pull request #2376 from cg2121/fix-window-width

UI: Fix buttons changing minimum window width
Jim 5 years ago
parent
commit
924580dbab
2 changed files with 38 additions and 5 deletions
  1. 35 5
      UI/forms/OBSBasic.ui
  2. 3 0
      UI/window-basic-main.cpp

+ 35 - 5
UI/forms/OBSBasic.ui

@@ -1120,11 +1120,17 @@
         <bool>true</bool>
         <bool>true</bool>
        </property>
        </property>
        <property name="sizePolicy">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
         </sizepolicy>
        </property>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
        <property name="text">
         <string>Basic.Main.StartStreaming</string>
         <string>Basic.Main.StartStreaming</string>
        </property>
        </property>
@@ -1156,14 +1162,14 @@
           <bool>true</bool>
           <bool>true</bool>
          </property>
          </property>
          <property name="sizePolicy">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
           </sizepolicy>
          </property>
          </property>
          <property name="minimumSize">
          <property name="minimumSize">
           <size>
           <size>
-           <width>130</width>
+           <width>0</width>
            <height>0</height>
            <height>0</height>
           </size>
           </size>
          </property>
          </property>
@@ -1179,6 +1185,18 @@
      </item>
      </item>
      <item>
      <item>
       <widget class="QPushButton" name="modeSwitch">
       <widget class="QPushButton" name="modeSwitch">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
        <property name="text">
         <string>Basic.TogglePreviewProgramMode</string>
         <string>Basic.TogglePreviewProgramMode</string>
        </property>
        </property>
@@ -1190,11 +1208,17 @@
      <item>
      <item>
       <widget class="QPushButton" name="settingsButton">
       <widget class="QPushButton" name="settingsButton">
        <property name="sizePolicy">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
         </sizepolicy>
        </property>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
        <property name="text">
         <string>Settings</string>
         <string>Settings</string>
        </property>
        </property>
@@ -1203,11 +1227,17 @@
      <item>
      <item>
       <widget class="QPushButton" name="exitButton">
       <widget class="QPushButton" name="exitButton">
        <property name="sizePolicy">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
         </sizepolicy>
        </property>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
        <property name="text">
         <string>Exit</string>
         <string>Exit</string>
        </property>
        </property>

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

@@ -1527,6 +1527,9 @@ void OBSBasic::ResetOutputs()
 				&QPushButton::clicked, this,
 				&QPushButton::clicked, this,
 				&OBSBasic::ReplayBufferClicked);
 				&OBSBasic::ReplayBufferClicked);
 
 
+			replayBufferButton->setSizePolicy(QSizePolicy::Ignored,
+							  QSizePolicy::Fixed);
+
 			replayLayout = new QHBoxLayout(this);
 			replayLayout = new QHBoxLayout(this);
 			replayLayout->addWidget(replayBufferButton);
 			replayLayout->addWidget(replayBufferButton);