Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI: Add new preview grid #10604

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UI: Add new preview grid #10604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions UI/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,12 @@ Basic.Settings.General.ScreenSnapping="Snap Sources to edge of screen"
Basic.Settings.General.CenterSnapping="Snap Sources to horizontal and vertical center"
Basic.Settings.General.SourceSnapping="Snap Sources to other sources"
Basic.Settings.General.SnapDistance="Snap Sensitivity"
Basic.Settings.General.ShowGrid="Show preview grid"
Basic.Settings.General.NeverShowGrid="Never"
Basic.Settings.General.AlwaysShowGrid="Always"
Basic.Settings.General.ShowGridWhenMoving="When moving a Source"
Basic.Settings.General.GridSpacing="Grid spacing"
Basic.Settings.General.GridSnapping="Snap Sources to grid"
Basic.Settings.General.SpacingHelpers="Show pixel alignment guides"
Basic.Settings.General.RecordWhenStreaming="Automatically record when streaming"
Basic.Settings.General.KeepRecordingWhenStreamStops="Keep recording when stream stops"
Expand Down Expand Up @@ -1200,6 +1206,7 @@ Basic.Settings.Accessibility.ColorOverrides="Use Different Colors"
Basic.Settings.Accessibility.ColorOverrides.SelectRed="Source Border (Selection)"
Basic.Settings.Accessibility.ColorOverrides.SelectGreen="Source Border (Crop)"
Basic.Settings.Accessibility.ColorOverrides.SelectBlue="Source Border (Hover)"
Basic.Settings.Accessibility.ColorOverrides.SelectGray="Preview Grid"
Basic.Settings.Accessibility.ColorOverrides.MixerGreen="Mixer Volume Band (-60 to -20dB)"
Basic.Settings.Accessibility.ColorOverrides.MixerYellow="Mixer Volume Band (-20 to -9dB)"
Basic.Settings.Accessibility.ColorOverrides.MixerRed="Mixer Volume Band (-9 to 0dB)"
Expand Down
185 changes: 174 additions & 11 deletions UI/forms/OBSBasicSettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,80 @@
</property>
</spacer>
</item>
<item row="6" column="0">
<widget class="QLabel" name="showGridLabel">
<property name="text">
<string>Basic.Settings.General.ShowGrid</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QComboBox" name="showGrid">
<property name="enabled">
<bool>true</bool>
</property>
<item>
<property name="text">
<string>Basic.Settings.General.NeverShowGrid</string>
</property>
</item>
<item>
<property name="text">
<string>Basic.Settings.General.AlwaysShowGrid</string>
</property>
</item>
<item>
<property name="text">
<string>Basic.Settings.General.ShowGridWhenMoving</string>
</property>
</item>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="gridSpacingLabel">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Basic.Settings.General.GridSpacing</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="gridSpacing">
<property name="enabled">
<bool>false</bool>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
<property name="maximum">
<double>50.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="stepType">
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="gridSnapping">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Basic.Settings.General.GridSnapping</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -6499,6 +6573,92 @@
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="colorSelectLabel_10">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.SelectGray</string>
</property>
<property name="buddy">
<cstring>choose10</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_10">
<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>
<widget class="QLabel" name="color10">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string notr="true">color here</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="choose10">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Basic.PropertiesWindow.SelectColor</string>
</property>
</widget>
</item>
<item>
<spacer name="colorSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="colorSelectLabel_4">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerGreen</string>
Expand All @@ -6508,7 +6668,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_4">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -6584,7 +6744,7 @@
</item>
</layout>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="colorSelectLabel_5">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerYellow</string>
Expand All @@ -6594,7 +6754,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_5">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -6670,7 +6830,7 @@
</item>
</layout>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="colorSelectLabel_6">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerRed</string>
Expand All @@ -6680,7 +6840,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_6">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -6756,7 +6916,7 @@
</item>
</layout>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="colorSelectLabel_7">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive</string>
Expand All @@ -6766,7 +6926,7 @@
</property>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_7">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -6842,7 +7002,7 @@
</item>
</layout>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QLabel" name="colorSelectLabel_8">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive</string>
Expand All @@ -6852,7 +7012,7 @@
</property>
</widget>
</item>
<item row="8" column="1">
<item row="9" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_8">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -6928,7 +7088,7 @@
</item>
</layout>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QLabel" name="colorSelectLabel_9">
<property name="text">
<string>Basic.Settings.Accessibility.ColorOverrides.MixerRedActive</string>
Expand All @@ -6938,7 +7098,7 @@
</property>
</widget>
</item>
<item row="9" column="1">
<item row="10" column="1">
<layout class="QHBoxLayout" name="colorSelectLayout_9">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -7983,6 +8143,9 @@
<tabstop>screenSnapping</tabstop>
<tabstop>sourceSnapping</tabstop>
<tabstop>centerSnapping</tabstop>
<tabstop>showGrid</tabstop>
<tabstop>gridSpacing</tabstop>
<tabstop>gridSnapping</tabstop>
<tabstop>hideProjectorCursor</tabstop>
<tabstop>projectorAlwaysOnTop</tabstop>
<tabstop>saveProjectors</tabstop>
Expand Down
5 changes: 5 additions & 0 deletions UI/obs-app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,11 @@ bool OBSApp::InitGlobalConfigDefaults()
false);
config_set_default_double(globalConfig, "BasicWindow", "SnapDistance",
10.0);
config_set_default_int(globalConfig, "BasicWindow", "ShowGrid", 0);
config_set_default_double(globalConfig, "BasicWindow", "GridSpacing",
10.0);
config_set_default_bool(globalConfig, "BasicWindow", "GridSnapping",
false);
config_set_default_bool(globalConfig, "BasicWindow",
"SpacingHelpersEnabled", true);
config_set_default_bool(globalConfig, "BasicWindow",
Expand Down
11 changes: 11 additions & 0 deletions UI/window-basic-main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11144,6 +11144,17 @@ QColor OBSBasic::GetHoverColor() const
}
}

QColor OBSBasic::GetGridColor() const
{
if (config_get_bool(GetGlobalConfig(), "Accessibility",
"OverrideColors")) {
return color_from_int(config_get_int(
GetGlobalConfig(), "Accessibility", "SelectGray"));
} else {
return QColor::fromRgb(169, 169, 169);
}
}

void OBSBasic::UpdatePreviewSpacingHelpers()
{
drawSpacingHelpers = config_get_bool(
Expand Down
1 change: 1 addition & 0 deletions UI/window-basic-main.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ class OBSBasic : public OBSMainWindow {

QColor GetCropColor() const;
QColor GetHoverColor() const;
QColor GetGridColor() const;

void UpdatePreviewSpacingHelpers();
bool drawSpacingHelpers = true;
Expand Down