hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper snap highlight colors for different themes

Browse Source
This commit is contained in:
SiboVG 2024-10-12 16:22:15 +02:00
parent f4b4e3ccc0
commit 1ee09f2850
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/main/java/info/openrocket/swing/gui/scalefigure/FinPointFigure.java
View File

@ -68,6 +68,7 @@ public class FinPointFigure extends AbstractScaleFigure {
private static Color finPointGridMinorLineColor; private static Color finPointGridMinorLineColor;
private static Color finPointPointColor; private static Color finPointPointColor;
private static Color finPointSelectedPointColor; private static Color finPointSelectedPointColor;
private static Color finPointSnapHighlightColor;
static { static {
initColors(); initColors();
@ -94,6 +95,7 @@ public class FinPointFigure extends AbstractScaleFigure {
finPointGridMinorLineColor = GUIUtil.getUITheme().getFinPointGridMinorLineColor(); finPointGridMinorLineColor = GUIUtil.getUITheme().getFinPointGridMinorLineColor();
finPointPointColor = GUIUtil.getUITheme().getFinPointPointColor(); finPointPointColor = GUIUtil.getUITheme().getFinPointPointColor();
finPointSelectedPointColor = GUIUtil.getUITheme().getFinPointSelectedPointColor(); finPointSelectedPointColor = GUIUtil.getUITheme().getFinPointSelectedPointColor();
finPointSnapHighlightColor = GUIUtil.getUITheme().getFinPointSnapHighlightColor();
} }
@Override @Override
@ -277,7 +279,7 @@ public class FinPointFigure extends AbstractScaleFigure {
final float highlightWidth_m = (float) (LINE_WIDTH_HIGHLIGHT_PIXELS / scale ); final float highlightWidth_m = (float) (LINE_WIDTH_HIGHLIGHT_PIXELS / scale );
g2.setStroke(new BasicStroke(highlightWidth_m)); g2.setStroke(new BasicStroke(highlightWidth_m));
g2.setColor(Color.RED); g2.setColor(finPointSnapHighlightColor);
g2.draw(new Line2D.Double(start.x, start.y, end.x, end.y)); g2.draw(new Line2D.Double(start.x, start.y, end.x, end.y));
} }

21
swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java
View File

@ -93,6 +93,7 @@ public class UITheme {
Color getFinPointPointColor(); Color getFinPointPointColor();
Color getFinPointSelectedPointColor(); Color getFinPointSelectedPointColor();
Color getFinPointBodyLineColor(); Color getFinPointBodyLineColor();
Color getFinPointSnapHighlightColor();
Icon getMassOverrideIcon(); Icon getMassOverrideIcon();
Icon getMassOverrideSubcomponentIcon(); Icon getMassOverrideSubcomponentIcon();
@ -404,6 +405,11 @@ public class UITheme {
return Color.BLACK; return Color.BLACK;
} }
@Override
public Color getFinPointSnapHighlightColor() {
return Color.RED;
}
@Override @Override
public Icon getMassOverrideIcon() { public Icon getMassOverrideIcon() {
return Icons.MASS_OVERRIDE_LIGHT; return Icons.MASS_OVERRIDE_LIGHT;
@ -805,6 +811,11 @@ public class UITheme {
return Color.WHITE; return Color.WHITE;
} }
@Override
public Color getFinPointSnapHighlightColor() {
return new Color(255, 58, 58, 255);
}
@Override @Override
public Icon getMassOverrideIcon() { public Icon getMassOverrideIcon() {
return Icons.MASS_OVERRIDE_DARK; return Icons.MASS_OVERRIDE_DARK;
@ -1206,6 +1217,11 @@ public class UITheme {
return Color.WHITE; return Color.WHITE;
} }
@Override
public Color getFinPointSnapHighlightColor() {
return new Color(241, 77, 77, 255);
}
@Override @Override
public Icon getMassOverrideIcon() { public Icon getMassOverrideIcon() {
return Icons.MASS_OVERRIDE_DARK; return Icons.MASS_OVERRIDE_DARK;
@ -1626,6 +1642,11 @@ public class UITheme {
return getCurrentTheme().getFinPointBodyLineColor(); return getCurrentTheme().getFinPointBodyLineColor();
} }
@Override
public Color getFinPointSnapHighlightColor() {
return getCurrentTheme().getFinPointBodyLineColor();
}
@Override @Override
public Icon getMassOverrideIcon() { public Icon getMassOverrideIcon() {
return getCurrentTheme().getMassOverrideIcon(); return getCurrentTheme().getMassOverrideIcon();