Skip to content

Commit

Permalink
Slight layout adjustments to better support new OBS themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@WarmUpTill
WarmUpTill committed Sep 5, 2022
1 parent aeaa139 commit bddbceb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions forms/advanced-scene-switcher.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
Expand Down Expand Up @@ -864,7 +864,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand All @@ -880,7 +880,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand Down Expand Up @@ -935,7 +935,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
Expand All @@ -954,7 +954,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand Down Expand Up @@ -1006,7 +1006,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand All @@ -1022,7 +1022,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand Down Expand Up @@ -1077,7 +1077,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand All @@ -1093,7 +1093,7 @@
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="flat">
Expand Down
8 changes: 4 additions & 4 deletions src/macro-core/macro-action-run.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,22 @@ MacroActionRunEdit::MacroActionRunEdit(
_filePath = new FileSelection();
_argList = new QListWidget();
_addArg = new QPushButton();
_addArg->setMaximumSize(QSize(22, 22));
_addArg->setMaximumWidth(22);
_addArg->setProperty("themeID",
QVariant(QString::fromUtf8("addIconSmall")));
_addArg->setFlat(true);
_removeArg = new QPushButton();
_removeArg->setMaximumSize(QSize(22, 22));
_removeArg->setMaximumWidth(22);
_removeArg->setProperty("themeID",
QVariant(QString::fromUtf8("removeIconSmall")));
_removeArg->setFlat(true);
_argUp = new QPushButton();
_argUp->setMaximumSize(QSize(22, 22));
_argUp->setMaximumWidth(22);
_argUp->setProperty("themeID",
QVariant(QString::fromUtf8("upArrowIconSmall")));
_argUp->setFlat(true);
_argDown = new QPushButton();
_argDown->setMaximumSize(QSize(22, 22));
_argDown->setMaximumWidth(22);
_argDown->setProperty(
"themeID", QVariant(QString::fromUtf8("downArrowIconSmall")));
_argDown->setFlat(true);
Expand Down
2 changes: 1 addition & 1 deletion src/macro-core/macro-condition-edit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ DurationModifierEdit::DurationModifierEdit(QWidget *parent)
_condition = new QComboBox(parent);
_duration = new DurationSelection(parent);
_toggle = new QPushButton(parent);
_toggle->setMaximumSize(22, 22);
_toggle->setMaximumWidth(22);
_toggle->setIcon(
QIcon(QString::fromStdString(getDataFilePath("res/time.svg"))));
populateDurationModifierTypes(_condition);
Expand Down
2 changes: 1 addition & 1 deletion src/utils/connection-manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void setButtonIcon(QPushButton *button, const char *path)
ConnectionSelection::ConnectionSelection(QWidget *parent)
: QWidget(parent), _selection(new QComboBox), _modify(new QPushButton)
{
_modify->setMaximumSize(22, 22);
_modify->setMaximumWidth(22);
setButtonIcon(_modify, ":/settings/images/settings/general.svg");
_modify->setFlat(true);

Expand Down
8 changes: 4 additions & 4 deletions src/utils/macro-list.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
_up->setVisible(reorder);
_down->setVisible(reorder);

_add->setMaximumSize(QSize(22, 22));
_add->setMaximumWidth(22);
_add->setProperty("themeID",
QVariant(QString::fromUtf8("addIconSmall")));
_add->setFlat(true);
_remove->setMaximumSize(QSize(22, 22));
_remove->setMaximumWidth(22);
_remove->setProperty("themeID",
QVariant(QString::fromUtf8("removeIconSmall")));
_remove->setFlat(true);
_up->setMaximumSize(QSize(22, 22));
_up->setMaximumWidth(22);
_up->setProperty("themeID",
QVariant(QString::fromUtf8("upArrowIconSmall")));
_up->setFlat(true);
_down->setMaximumSize(QSize(22, 22));
_down->setMaximumWidth(22);
_down->setProperty("themeID",
QVariant(QString::fromUtf8("downArrowIconSmall")));
_down->setFlat(true);
Expand Down

0 comments on commit bddbceb

Please sign in to comment.