Skip to content

add scroll for tools menu, fix of font size for castle wars guides #12

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

Merged
5GameMaker merged 2 commits into from
Jun 11, 2026
Merged

add scroll for tools menu, fix of font size for castle wars guides #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f5213d
add scroll for tools menu
RE-AST Jun 11, 2026
21ee353
Merge remote-tracking branch 'origin/master'
RE-AST Jun 11, 2026
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
32 changes: 24 additions & 8 deletions src/main/java/mindurka/rules/Castle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,17 @@ public void drawEditorGuides() {
Draw.reset();

GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
Fonts.outline.getData().setScale(0.5f * Scl.scl(15) / (128 / MVars.mapView.zoom()));
String label =Core.bundle.get("rules.mindurka.castle.block.cost")+": "+block.cost+"\n"+
Core.bundle.get("rules.status.invincible")+": "+block.invincible;
float blockW = v2.x - sx;
float blockH = v2.y - sy;
String label = Core.bundle.get("rules.mindurka.castle.block.cost") + ": " + block.cost + "\n" +
Core.bundle.get("rules.status.invincible") + ": " + block.invincible;

Fonts.outline.getData().setScale(1f);
layout.setText(Fonts.outline, label);
float scaleX = blockW / layout.width;
float scaleY = blockH / layout.height;
float fontScale = Math.min(scaleX, scaleY) * 0.9f;
Fonts.outline.getData().setScale(fontScale);
layout.setText(Fonts.outline, label);

float cx = (sx + v2.x) / 2;
Expand Down Expand Up @@ -266,12 +274,20 @@ public void drawEditorGuides() {
Draw.reset();

GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
Fonts.outline.getData().setScale(0.5f * Scl.scl(15) / (128 / MVars.mapView.zoom()));
float blockW = v2.x - sx;
float blockH = v2.y - sy;
String label =
Core.bundle.get("rules.mindurka.castle.item.cost")+": "+miner.cost+"\n"+
Core.bundle.get("rules.mindurka.castle.item.interval")+": "+miner.interval+"\n"+
Core.bundle.get("rules.mindurka.castle.item.amount")+": "+miner.amount+"\n"+
Core.bundle.get("rules.mindurka.castle.item")+": "+(miner.item != null ? miner.item.emoji()+"("+miner.item+")" : "?");
Core.bundle.get("rules.mindurka.castle.item.cost") + ": " + miner.cost + "\n" +
Core.bundle.get("rules.mindurka.castle.item.interval") + ": " + miner.interval + "\n" +
Core.bundle.get("rules.mindurka.castle.item.amount") + ": " + miner.amount + "\n" +
Core.bundle.get("rules.mindurka.castle.item") + ": " + (miner.item != null ? miner.item.emoji() + "(" + miner.item + ")" : "?");

Fonts.outline.getData().setScale(1f);
layout.setText(Fonts.outline, label);
float scaleX = blockW / layout.width;
float scaleY = blockH / layout.height;
float fontScale = Math.min(scaleX, scaleY) * 0.9f;
Fonts.outline.getData().setScale(fontScale);
layout.setText(Fonts.outline, label);

float cx = (sx + v2.x) / 2;
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/mindurka/ui/OEditorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,10 @@ public void build() {
mid.table(t -> blockOptions = t).top().padBottom(6).left().growX().fillX();
rebuildBlockOptions();
}
mid.setFillParent(true);
ScrollPane midPane = new ScrollPane(mid, Styles.smallPane);
midPane.setFadeScrollBars(false);
midPane.setOverscroll(false, false);
midPane.setFillParent(true);
Table midOverlay = new Table();
midOverlay.table(t -> {
ImageButton button = new ImageButton(Icon.cancel, Styles.clearNoneTogglei);
Expand Down Expand Up @@ -451,7 +454,7 @@ public void build() {
midOverlay.touchable = view.editorAction == null ? Touchable.disabled : Touchable.enabled;
});
midOverlay.setFillParent(true);
cont.stack(mid, midOverlay).margin(0).left().growY();
cont.stack(midPane, midOverlay).margin(0).left().growY();

cont.table(t -> t.add(view).grow()).grow();

Expand Down
Loading