diff options
| author | Lars-Christian Selland <larsy1995@gmail.com> | 2025-03-23 04:42:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-22 23:42:59 -0400 |
| commit | 7f56e37bde9a326184075adb6c4332bf2826e7a2 (patch) | |
| tree | c4ae0c2968d8a308450ff897f5e903f075f2a177 | |
| parent | 83c703657348140eba5ed297fa381f98e45e6855 (diff) | |
2Ship side changes to take advantage of the macOS scaling fixes (#987)
* Parity with upstream
* Changes needed for resolution changes on macOS
* Revert "Parity with upstream"
This reverts commit 6bfdee805e0c8b41b104e1131a7341e14259f82b.
| -rw-r--r-- | mm/2s2h/BenGui/BenMenu.cpp | 2 | ||||
| -rw-r--r-- | mm/2s2h/BenGui/ResolutionEditor.cpp | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/mm/2s2h/BenGui/BenMenu.cpp b/mm/2s2h/BenGui/BenMenu.cpp index b90696527..5b1d38177 100644 --- a/mm/2s2h/BenGui/BenMenu.cpp +++ b/mm/2s2h/BenGui/BenMenu.cpp @@ -242,7 +242,6 @@ void BenMenu::AddSettings() { .CVar("gSettings.Fullscreen") .Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); }) .Options(CheckboxOptions().Tooltip("Toggles Fullscreen On/Off.")); -#ifndef __APPLE__ AddWidget(path, "Internal Resolution: %.0f%%", WIDGET_CVAR_SLIDER_FLOAT) .CVar(CVAR_INTERNAL_RESOLUTION) .Callback([](WidgetInfo& info) { @@ -267,7 +266,6 @@ void BenMenu::AddSettings() { .Format("") .Min(0.5f) .Max(2.0f)); -#endif #ifndef __WIIU__ AddWidget(path, "Anti-aliasing (MSAA): %d", WIDGET_CVAR_SLIDER_INT) .CVar(CVAR_MSAA_VALUE) diff --git a/mm/2s2h/BenGui/ResolutionEditor.cpp b/mm/2s2h/BenGui/ResolutionEditor.cpp index 82d73c311..818bdf41a 100644 --- a/mm/2s2h/BenGui/ResolutionEditor.cpp +++ b/mm/2s2h/BenGui/ResolutionEditor.cpp @@ -87,11 +87,6 @@ using namespace UIWidgets; void RegisterResolutionWidgets() { WidgetPath path = { "Settings", "Graphics", 2 }; -#ifdef __APPLE__ - mBenMenu - ->AddWidget(path, ICON_FA_INFO_CIRCLE " These settings may behave incorrectly on Retina displays.", WIDGET_TEXT) - .Options(WidgetOptions().Color(Colors::Green)); -#endif // Resolution visualiser mBenMenu->AddWidget(path, "Viewport dimensions: {} x {}", WIDGET_TEXT).PreFunc([](WidgetInfo& info) { |