mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding new styling for the menubar.

This commit is contained in:
Stian Grenborgen 2023-05-20 19:05:57 +02:00
parent d60fb12a93
commit edf47c35e7
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/base/resources.properties
View File

@ -27,6 +27,7 @@ animatedfont.signature=resources/fonts/signature.faf
## Images
# Backgrounds
image.empty=resources/images/empty.png
image.background.Paper=resources/images/ui/bg_paper.png
image.background.ColorCellRenderer=resource:image.background.Paper
image.background.FreeColBrightPanel=resources/images/ui/bg_paper_bright.png
@ -37,7 +38,7 @@ image.background.AboutPanel=resources/images/ui/bg_brown.png
image.background.ColopediaPanel=resources/images/ui/bg_brown.png
image.background.FreeColList=resource:image.background.Paper
image.background.FreeColMenuBar=resources/images/ui/bg_brown.png
image.background.FreeColMenuBar=resources/images/ui/bg_menubar.png
image.background.FreeColMenu=resources/images/ui/bg_paper_brown.png
image.background.FreeColOptionPane=resource:image.background.Paper
image.background.FreeColPanel=resource:image.background.Paper
@ -48,6 +49,7 @@ image.background.FreeColTextField=resource:image.background.FreeColBrightPanel
image.background.FreeColToolTip=resource:image.background.Paper
# Borders
#image.border.menu.s=resource:image.empty
image.border.menu.s=resources/images/ui/menuborder.png
image.border.panel.noshadow.n=resources/images/ui/panelborder-noshadow-n.png

BIN
data/base/resources/images/ui/bg_menubar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB

42
src/net/sf/freecol/client/gui/menu/InGameMenuBar.java
View File

@ -19,12 +19,18 @@
package net.sf.freecol.client.gui.menu;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.event.KeyEvent;
import java.awt.event.MouseMotionListener;
import java.awt.font.TextLayout;
import java.awt.geom.Rectangle2D;
import java.util.logging.Logger;
@ -322,14 +328,16 @@ public class InGameMenuBar extends FreeColMenuBar {
.addAmount("%tax%", player.getTax())
.addAmount("%score%", player.getScore())
.addStringTemplate("%year%", this.freeColClient.getGame()
.getTurn().getLabel()));
.getTurn().getLabel())).replace("|", "✧");
Graphics2D g2d = (Graphics2D)g;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
g2d.setFont(FontLibrary.getMainFont());
final Font font = FontLibrary.getMainFont();
g2d.setFont(font);
final FontMetrics fm = g2d.getFontMetrics();
final Rectangle2D d = fm.getStringBounds(text, g2d);
@ -338,8 +346,32 @@ public class InGameMenuBar extends FreeColMenuBar {
final int rightSidePaddingInPx = 10;
final int centerHeight = getHeight() - getInsets().bottom;
g2d.drawString(text,
getWidth() - rightSidePaddingInPx - textWidth - getInsets().right,
(centerHeight - textHeight) / 2 + fm.getAscent());
final int x = getWidth() - rightSidePaddingInPx - textWidth - getInsets().right;
final int y = (centerHeight - textHeight) / 2 + fm.getAscent();
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
final Shape textShape = new TextLayout(text, font, g2d.getFontRenderContext()).getOutline(null);
final float strokeScaling = FontLibrary.getFontScaling() / 2;
final Stroke oldStroke = g2d.getStroke();
g2d.translate(x, y);
g2d.setStroke(new BasicStroke(strokeScaling * 4f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
g2d.setColor(Color.BLACK);
g2d.draw(textShape);
g2d.setStroke(new BasicStroke(strokeScaling * 2f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
g2d.setColor(new Color(162, 136, 105));
g2d.draw(textShape);
g2d.setStroke(new BasicStroke(strokeScaling * 1f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
g2d.setColor(new Color(64, 31, 6));
g2d.draw(textShape);
g2d.setStroke(oldStroke);
g2d.setColor(new Color(222, 194, 161));
g2d.fill(textShape);
g2d.translate(-x, -y);
}
}