Skip to content

fix(gui): fix macOS GUI scale ratio and avoid double-scaling minWidth in DefaultSettingsWidgetFactory #6721

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

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

fix(gui): fix macOS GUI scale ratio and avoid double-scaling minWidth in DefaultSettingsWidgetFactory #6721

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/gui/DefaultSettingsWidgetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public WWidget create(GuiTheme theme, Settings settings, String filter) {

// Calculate width and set it as minimum width
list.calculateSize();
list.minWidth = list.width;
list.minWidth = list.width / theme.scale(1);

// Remove hidden settings
for (RemoveInfo removeInfo : removeInfoList) {
Expand Down Expand Up @@ -207,7 +207,7 @@ private void doubleW(WTable table, DoubleSetting setting) {
private void stringW(WTable table, StringSetting setting) {
CharFilter filter = setting.filter == null ? (_, _) -> true : setting.filter;
Cell<WTextBox> cell = table.add(theme.textBox(setting.get(), setting.placeholder, filter, setting.renderer));
if (setting.wide) cell.minWidth(Utils.getWindowWidth() - Utils.getWindowWidth() / 4.0);
if (setting.wide) cell.minWidth((Utils.getWindowWidth() - Utils.getWindowWidth() / 4.0) / theme.scale(1));

WTextBox textBox = cell.expandX().widget();
textBox.action = () -> setting.set(textBox.get());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/MeteorGuiTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ public double scale(double value) {
double scaled = value * scale.get();

if (SystemUtils.IS_OS_MAC) {
scaled /= (double) mc.getWindow().getWidth() / mc.getWindow().getWidth();
scaled /= (double) mc.getWindow().getScreenWidth() / mc.getWindow().getWidth();
}

return scaled;
Expand Down
Loading