diff --git a/src/tabs/about.cpp b/src/tabs/about.cpp index f70fca33..c20cd87a 100644 --- a/src/tabs/about.cpp +++ b/src/tabs/about.cpp @@ -326,7 +326,7 @@ SKIF_UI_Tab_DrawAbout (void) ImGui::GetStyleColorVec4(ImGuiCol_SKIF_Info), ICON_FA_UP_RIGHT_FROM_SQUARE " " ); ImGui::SameLine ( ); - if (ImGui::Selectable ("Do not use Special K in multiplayer games!")) + if (ImGui::Selectable ("Do not use in multiplayer games!")) SKIF_Util_OpenURI (L"https://wiki.special-k.info/en/SpecialK/Global#multiplayer-games"); SKIF_ImGui_SetMouseCursorHand (); SKIF_ImGui_SetHoverText ( "https://wiki.special-k.info/en/SpecialK/Global#multiplayer-games"); diff --git a/src/tabs/monitor.cpp b/src/tabs/monitor.cpp index 912ed823..e0de6c5d 100644 --- a/src/tabs/monitor.cpp +++ b/src/tabs/monitor.cpp @@ -721,7 +721,7 @@ SKIF_UI_Tab_DrawMonitor (void) ImGui::BeginGroup ( ); - if (ImGui::Checkbox ("Show remaining processes", &_registry.bProcessIncludeAll)) + if (ImGui::Checkbox ("Show misc processes", &_registry.bProcessIncludeAll)) _registry.regKVProcessIncludeAll.putData (_registry.bProcessIncludeAll); SKIF_ImGui_SetHoverTip ("If this is enabled the below list will also include uninjected processes.\n" @@ -748,7 +748,7 @@ SKIF_UI_Tab_DrawMonitor (void) ImGui::SameLine ( ); - ImGui::SetNextItemWidth (150.0f * SKIF_ImGui_GlobalDPIScale); + ImGui::SetNextItemWidth (100.0f * SKIF_ImGui_GlobalDPIScale); if (ImGui::BeginCombo ("###SKIF_iProcRefreshIntervalCombo", RefreshIntervalCurrent)) // The second parameter is the label previewed before opening the combo. { diff --git a/src/tabs/settings.cpp b/src/tabs/settings.cpp index dda14697..c69923fc 100644 --- a/src/tabs/settings.cpp +++ b/src/tabs/settings.cpp @@ -716,7 +716,7 @@ SKIF_UI_Tab_DrawSettings (void) ImGui::SameLine ( ); ImGui::TextColored ( ImGui::GetStyleColorVec4(ImGuiCol_SKIF_TextCaption), - "Show desktop notifications for the injection service:" + "Show injection service desktop notifications:" ); ImGui::TreePush ("Notifications"); if (ImGui::RadioButton ("Never", &_registry.iNotifications, 0)) @@ -838,45 +838,47 @@ SKIF_UI_Tab_DrawSettings (void) ); ImGui::TreePush ("Libraries"); + ImGui::BeginGroup ( ); + if (ImGui::Checkbox ("Epic", &_registry.bLibraryEpic)) { _registry.regKVLibraryEpic.putData (_registry.bLibraryEpic); RepopulateGames = true; } - ImGui::SameLine ( ); - ImGui::Spacing ( ); - ImGui::SameLine ( ); - if (ImGui::Checkbox ("GOG", &_registry.bLibraryGOG)) { _registry.regKVLibraryGOG.putData (_registry.bLibraryGOG); RepopulateGames = true; } + ImGui::EndGroup ( ); + ImGui::SameLine ( ); ImGui::Spacing ( ); ImGui::SameLine ( ); + ImGui::BeginGroup ( ); + if (ImGui::Checkbox ("Steam", &_registry.bLibrarySteam)) { _registry.regKVLibrarySteam.putData (_registry.bLibrarySteam); RepopulateGames = true; } - ImGui::SameLine ( ); - ImGui::Spacing ( ); - ImGui::SameLine ( ); - if (ImGui::Checkbox ("Xbox", &_registry.bLibraryXbox)) { _registry.regKVLibraryXbox.putData (_registry.bLibraryXbox); RepopulateGames = true; } + ImGui::EndGroup ( ); + ImGui::SameLine ( ); ImGui::Spacing ( ); ImGui::SameLine ( ); + + ImGui::BeginGroup ( ); if (ImGui::Checkbox ("Custom", &_registry.bLibraryCustom)) { @@ -884,6 +886,8 @@ SKIF_UI_Tab_DrawSettings (void) RepopulateGames = true; } + ImGui::EndGroup ( ); + ImGui::TreePop ( ); ImGui::TextColored (ImGui::GetStyleColorVec4 (ImGuiCol_SKIF_Warning), ICON_FA_TRIANGLE_EXCLAMATION); // ImColor::HSV(0.11F, 1.F, 1.F) @@ -2511,7 +2515,8 @@ SKIF_UI_Tab_DrawSettings (void) if (SKIF_Util_IsWindows10OrGreater ( )) { - ImGui::BeginGroup (); + ImGui::BeginChild ("##MPOChild", ImVec2 (0, 0), ImGuiChildFlags_None, ImGuiWindowFlags_HorizontalScrollbar); + ImGui::BeginGroup ( ); ImGui::Text ("Display"); ImGui::SameLine ( ); @@ -2566,7 +2571,7 @@ SKIF_UI_Tab_DrawSettings (void) // This adds a couple of empty lines to expand the height of the clickable area // where the DisplayDriverMenu is accessible - static const int maxMon = 4; + constexpr int maxMon = 4; if (Monitors.size() < maxMon) { size_t rem = maxMon - Monitors.size(); @@ -2575,7 +2580,8 @@ SKIF_UI_Tab_DrawSettings (void) ImGui::NewLine ( ); } - ImGui::EndGroup (); + ImGui::EndGroup ( ); + ImGui::EndChild ( ); if (ImGui::IsItemClicked (ImGuiMouseButton_Right)) ImGui::OpenPopup ("DisplayDriverMenu");