Option to disable GlosSIs additional overlay

pull/212/head
Peter Repukat 1 year ago
parent 2ac3325c5b
commit b76b6ee595

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,1,1,204000619719 FILEVERSION 0,1,1,2012005004400
PRODUCTVERSION 0,1,1,204000619719 PRODUCTVERSION 0,1,1,2012005004400
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
VALUE "FileDescription", "GlosSI - Config" VALUE "FileDescription", "GlosSI - Config"
VALUE "FileVersion", "0.1.1.2-4-gf619719" VALUE "FileVersion", "0.1.1.2-12-g5fe44d0"
VALUE "InternalName", "GlosSIConfig" VALUE "InternalName", "GlosSIConfig"
VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "OriginalFilename", "GlosSIConfig.exe"
VALUE "ProductName", "GlosSI" VALUE "ProductName", "GlosSI"
VALUE "ProductVersion", "0.1.1.2-4-gf619719" VALUE "ProductVersion", "0.1.1.2-12-g5fe44d0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -1436,6 +1436,70 @@ IDI_ICON1 ICON "..\GlosSI_Icon.ico"

@ -428,6 +428,7 @@ QVariantMap UIModel::getDefaultConf() const
{"maxFps", QJsonValue::Null}, {"maxFps", QJsonValue::Null},
{"scale", QJsonValue::Null}, {"scale", QJsonValue::Null},
{"windowMode", false}, {"windowMode", false},
{"disableGlosSIOverlay", false},
}}, }},
}; };

@ -140,7 +140,7 @@ CollapsiblePane {
RPane { RPane {
width: parent.width / 2 - 8 width: parent.width / 2 - 8
height: 280 height: 324
radius: 4 radius: 4
Material.elevation: 32 Material.elevation: 32
bgOpacity: 0.97 bgOpacity: 0.97
@ -290,7 +290,7 @@ CollapsiblePane {
} }
RPane { RPane {
width: parent.width / 2 - 8 width: parent.width / 2 - 8
height: 280 height: 324
radius: 4 radius: 4
Material.elevation: 32 Material.elevation: 32
bgOpacity: 0.97 bgOpacity: 0.97
@ -401,6 +401,39 @@ CollapsiblePane {
width: 1 width: 1
height: 4 height: 4
} }
Row {
CheckBox {
id: disableGlosSIOverlayCheckbox
text: qsTr("Disable GlosSI overlay")
checked: shortcutInfo.window.disableGlosSIOverlay
onCheckedChanged: shortcutInfo.window.disableGlosSIOverlay = checked
}
RoundButton {
onClicked: () => {
helpInfoDialog.titleText = qsTr("Disable GlosSI overlay")
helpInfoDialog.text =
qsTr("Disables the additional GlosSI overlay")
+ "\n"
+ qsTr("but keeps the Steam overlay");
helpInfoDialog.open()
}
width: 48
height: 48
Material.elevation: 0
anchors.topMargin: 16
Image {
anchors.centerIn: parent
source: "qrc:/svg/help_outline_white_24dp.svg"
width: 24
height: 24
}
}
}
Item {
width: 1
height: 4
}
Row { Row {
leftPadding: 16 leftPadding: 16
Label { Label {

@ -182,6 +182,11 @@ void Overlay::update()
} }
} }
if (Settings::window.disableGlosSIOverlay) {
ImGui::SFML::Render(window_);
return;
}
showLogs(0); showLogs(0);
if (enabled_ || force_enable_) { if (enabled_ || force_enable_) {

@ -55,6 +55,7 @@ inline struct Window {
float scale = 0.f; float scale = 0.f;
bool disableOverlay = false; bool disableOverlay = false;
bool hideAltTab = false; bool hideAltTab = false;
bool disableGlosSIOverlay = false;
} window; } window;
inline struct Controller { inline struct Controller {
@ -193,6 +194,7 @@ inline void Parse(const nlohmann::basic_json<>& json)
safeParseValue(winconf, "scale", window.scale); safeParseValue(winconf, "scale", window.scale);
safeParseValue(winconf, "disableOverlay", window.disableOverlay); safeParseValue(winconf, "disableOverlay", window.disableOverlay);
safeParseValue(winconf, "hideAltTab", window.hideAltTab); safeParseValue(winconf, "hideAltTab", window.hideAltTab);
safeParseValue(winconf, "disableGlosSIOverlay", window.disableGlosSIOverlay);
} }
if (auto controllerConf = json["controller"]; !controllerConf.is_null() && !controllerConf.empty() && controllerConf.is_object()) { if (auto controllerConf = json["controller"]; !controllerConf.is_null() && !controllerConf.empty() && controllerConf.is_object()) {

@ -180,6 +180,9 @@ void SteamTarget::onOverlayChanged(bool overlay_open)
void SteamTarget::toggleGlossiOverlay() void SteamTarget::toggleGlossiOverlay()
{ {
if (Settings::window.disableGlosSIOverlay) {
return;
}
if (overlay_.expired()) { if (overlay_.expired()) {
return; return;
} }

Loading…
Cancel
Save