Skip to content

Acount for Padding for IDrawables #97

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
brachy84 merged 4 commits into from
Dec 11, 2024
Merged

Acount for Padding for IDrawables #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b25b333
account for padding when drawing area
ghzdude Dec 7, 2024
32ff865
use padding for x, y
ghzdude Dec 7, 2024
843e2b5
use area x and y and add padding
ghzdude Dec 8, 2024
f3034f8
fix widget drawing
ghzdude Dec 8, 2024
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
23 changes: 18 additions & 5 deletions src/main/java/com/cleanroommc/modularui/api/drawable/IDrawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ static IDrawable of(IDrawable... drawables) {
* @param y y position
* @param width draw width
* @param height draw height
* @param widgetTheme current theme
*/
@SideOnly(Side.CLIENT)
void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme);
Expand Down Expand Up @@ -66,7 +67,7 @@ default void drawAtZero(GuiContext context, int width, int height) {
* @param context gui context
* @param width draw width
* @param height draw height
* @param widgetTheme
* @param widgetTheme current theme
*/
@SideOnly(Side.CLIENT)
default void drawAtZero(GuiContext context, int width, int height, WidgetTheme widgetTheme) {
Expand All @@ -79,18 +80,19 @@ default void drawAtZero(GuiContext context, int width, int height, WidgetTheme w
@SideOnly(Side.CLIENT)
@Deprecated
default void draw(GuiContext context, Area area) {
draw(context, area.x, area.y, area.width, area.height, WidgetTheme.getDefault());
draw(context, area, WidgetTheme.getDefault());
}

/**
* Draws this drawable in a given area.
*
* @param context current context to draw with
* @param area draw area
* @param widgetTheme current theme
*/
@SideOnly(Side.CLIENT)
default void draw(GuiContext context, Area area, WidgetTheme widgetTheme) {
draw(context, area.x, area.y, area.width, area.height, widgetTheme);
draw(context, area.x + area.getPadding().left, area.y + area.getPadding().top, area.paddedWidth(), area.paddedHeight(), widgetTheme);
}

/**
Expand All @@ -99,18 +101,19 @@ default void draw(GuiContext context, Area area, WidgetTheme widgetTheme) {
@Deprecated
@SideOnly(Side.CLIENT)
default void drawAtZero(GuiContext context, Area area) {
draw(context, 0, 0, area.width, area.height, WidgetTheme.getDefault());
drawAtZero(context, area, WidgetTheme.getDefault());
}

/**
* Draws this drawable at the current (0|0) with the given area's size.
*
* @param context gui context
* @param area draw area
* @param widgetTheme current theme
*/
@SideOnly(Side.CLIENT)
default void drawAtZero(GuiContext context, Area area, WidgetTheme widgetTheme) {
draw(context, 0, 0, area.width, area.height, widgetTheme);
draw(context, 0, 0, area.paddedWidth(), area.paddedHeight(), widgetTheme);
}

/**
Expand Down Expand Up @@ -175,5 +178,15 @@ public DrawableWidget(IDrawable drawable) {
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
this.drawable.drawAtZero(context, getArea(), widgetTheme);
}

@Override
public boolean equals(Object obj) {
if (obj instanceof IDrawable drawable)
return this.drawable == drawable;
else if (obj instanceof DrawableWidget drawableWidget)
return this.drawable == drawableWidget.drawable;

return false;
}
}
}
5 changes: 2 additions & 3 deletions src/main/java/com/cleanroommc/modularui/widget/Widget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void dispose() {
public void drawBackground(ModularGuiContext context, WidgetTheme widgetTheme) {
IDrawable bg = getCurrentBackground(context.getTheme(), widgetTheme);
if (bg != null) {
bg.drawAtZero(context, getArea(), widgetTheme);
bg.drawAtZero(context, getArea().width, getArea().height, widgetTheme);
}
}

Expand All @@ -158,8 +158,7 @@ public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {}
public void drawOverlay(ModularGuiContext context, WidgetTheme widgetTheme) {
IDrawable bg = getCurrentOverlay(context.getTheme(), widgetTheme);
if (bg != null) {
Box padding = getArea().getPadding();
bg.draw(context, padding.left, padding.top, getArea().width - padding.horizontal(), getArea().height - padding.vertical(), widgetTheme);
bg.drawAtZero(context, getArea(), widgetTheme);
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/cleanroommc/modularui/widget/sizer/Area.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,18 @@ public int requestedWidth() {
return this.width + this.margin.horizontal();
}

public int paddedWidth() {
return this.width - this.padding.horizontal();
}

public int requestedHeight() {
return this.height + this.margin.vertical();
}

public int paddedHeight() {
return this.height - this.padding.vertical();
}

public int requestedSize(GuiAxis axis) {
return axis.isHorizontal() ? requestedWidth() : requestedHeight();
}
Expand Down