diff options
| author | Feng Chen <VonChenPlus@gmail.com> | 2021-12-18 13:57:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 13:57:14 +0800 |
| commit | e49184e6069a9d791d2df3c1958f5c4b1187e124 (patch) | |
| tree | b776caf722e0be0e680f67b0ad0842628162ef1c /src/yuzu/configuration/configure_general.ui | |
| parent | 4dd85f86a89338ff84d05a3981c14f6de1be4606 (diff) | |
| parent | 77d06d5df02d18da381bcd572ce11fee790d9edf (diff) | |
Merge branch 'yuzu-emu:master' into convert_legacy
Diffstat (limited to 'src/yuzu/configuration/configure_general.ui')
| -rw-r--r-- | src/yuzu/configuration/configure_general.ui | 99 |
1 files changed, 75 insertions, 24 deletions
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index f9f0e3ebf..112dc72b3 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>329</width> - <height>407</height> + <width>744</width> + <height>568</height> </rect> </property> <property name="windowTitle"> @@ -28,34 +28,85 @@ <item> <layout class="QVBoxLayout" name="GeneralVerticalLayout"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="fps_cap_label"> + <widget class="QWidget" name="fps_cap_layout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QComboBox" name="fps_cap_combobox"> + <property name="currentText"> + <string>Use global framerate cap</string> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <item> <property name="text"> - <string>Framerate Cap</string> + <string>Use global framerate cap</string> </property> - <property name="toolTip"> - <string>Requires the use of the FPS Limiter Toggle hotkey to take effect.</string> + </item> + <item> + <property name="text"> + <string>Set framerate cap:</string> </property> + </item> </widget> - </item> - <item> - <widget class="QSpinBox" name="fps_cap"> - <property name="suffix"> - <string>x</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>1000</number> - </property> - <property name="value"> - <number>500</number> - </property> + </item> + <item> + <widget class="QLabel" name="fps_cap_label"> + <property name="toolTip"> + <string>Requires the use of the FPS Limiter Toggle hotkey to take effect.</string> + </property> + <property name="text"> + <string>Framerate Cap</string> + </property> </widget> - </item> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QSpinBox" name="fps_cap"> + <property name="suffix"> + <string>x</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>1000</number> + </property> + <property name="value"> + <number>500</number> + </property> + </widget> + </item> </layout> + </widget> </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> |