Skip to content

Das Scaling unter Windows berücksichtigen. #424

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
ilhany359 wants to merge 1 commit into
base: WollMux_18.1
Choose a base branch
from
+30 −0
Open

Das Scaling unter Windows berücksichtigen. #424

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
3 changes: 3 additions & 0 deletions src/de/muenchen/allg/itd51/wollmux/event/handlers/OnNotifyDocumentEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.muenchen.allg.itd51.wollmux.event.handlers;

import java.awt.Dimension;
import java.awt.Insets;
import java.beans.PropertyChangeEvent;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -159,6 +160,7 @@ private void setWindowPosSize(FormController formController,
LOGGER.debug("", e);
}

Dimension dimFrame = formController.getFrameSize();
java.awt.Rectangle frameB = formController.getFrameBounds();
java.awt.Rectangle maxWindowBounds = formController.getMaxWindowBounds();
Insets windowInsets = formController.getWindowInsets();
Expand All @@ -177,6 +179,7 @@ private void setWindowPosSize(FormController formController,
docWidth = maxWindowBounds.width;
}
int docY = maxWindowBounds.y + windowInsets.top;
docX = (int) (dimFrame.width * formController.getScalingFactor());
/*
* Das Subtrahieren von 2*windowInsets.bottom ist ebenfalls eine Heuristik. (siehe weiter oben)
*/
Expand Down
11 changes: 11 additions & 0 deletions src/de/muenchen/allg/itd51/wollmux/form/control/FormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.muenchen.allg.itd51.wollmux.form.control;

import java.awt.Dimension;
import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.event.ActionListener;
Expand Down Expand Up @@ -79,6 +80,16 @@ public Rectangle getMaxWindowBounds()
return maxWindowBounds;
}

public Dimension getFrameSize()
{
return gui.getFrameSize();
}

public double getScalingFactor()
{
return gui.getScalingFactor();
}

public Insets getWindowInsets()
{
return windowInsets;
Expand Down
16 changes: 16 additions & 0 deletions src/de/muenchen/allg/itd51/wollmux/form/dialog/GUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
Expand All @@ -14,6 +16,7 @@
import java.awt.event.FocusEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.geom.AffineTransform;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.EnumMap;
Expand Down Expand Up @@ -975,4 +978,17 @@ public void valueChanged(String id, String value)
});
}
}

public Dimension getFrameSize()
{
return myFrame.getBounds().getSize();
}

public double getScalingFactor()
{
GraphicsConfiguration gc = myFrame.getGraphicsConfiguration();
AffineTransform df = gc.getDefaultTransform();
return df.getScaleX();
}

}