Skip to content

Allow Inverting Selected Texture #94

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 2 commits into from
Nov 12, 2024
Merged

Allow Inverting Selected Texture #94

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
aa30c51
add the ability to invert selected textures for ToggleButton and Page…
ghzdude Nov 11, 2024
bab10bc
use in ColorPickerDialog
ghzdude Nov 11, 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
6 changes: 2 additions & 4 deletions src/main/java/com/cleanroommc/modularui/widgets/ColorPickerDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,11 @@ public ColorPickerDialog(String name, Consumer<Integer> resultConsumer, int star
.left(5).right(5).height(14)
.child(new PageButton(0, controller)
.sizeRel(0.5f, 1f)
.background(true, GuiTextures.BUTTON_CLEAN)
.background(false, GuiTextures.SLOT_FLUID)
.invertSelected(true)
.overlay(IKey.str("RGB")))
.child(new PageButton(1, controller)
.sizeRel(0.5f, 1f)
.background(true, GuiTextures.BUTTON_CLEAN)
.background(false, GuiTextures.SLOT_FLUID)
.invertSelected(true)
.overlay(IKey.str("HSV"))))
.child(new Row().widthRel(1f).height(12).marginTop(4)
.child(IKey.str("Hex: ").asWidget().heightRel(1f))
Expand Down
16 changes: 13 additions & 3 deletions src/main/java/com/cleanroommc/modularui/widgets/PageButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class PageButton extends Widget<PageButton> implements Interactable {
private final int index;
private final PagedWidget.Controller controller;
private IDrawable inactiveTexture = null;
private boolean invert = false;

public PageButton(int index, PagedWidget.Controller controller) {
this.index = index;
Expand All @@ -26,7 +27,7 @@ public PageButton(int index, PagedWidget.Controller controller) {
@Override
public WidgetTheme getWidgetThemeInternal(ITheme theme) {
WidgetThemeSelectable widgetTheme = theme.getToggleButtonTheme();
return isActive() ? widgetTheme : widgetTheme.getSelected();
return isActive() ^ invertSelected() ? widgetTheme : widgetTheme.getSelected();
}

@Override
Expand Down Expand Up @@ -63,9 +64,18 @@ public PageButton background(boolean active, IDrawable... background) {
}

public PageButton tab(TabTexture texture, int location) {
return background(false, texture.get(location, false))
.background(true, texture.get(location, true))
return background(invertSelected(), texture.get(location, invertSelected()))
.background(!invertSelected(), texture.get(location, !invertSelected()))
.disableHoverBackground()
.size(texture.getWidth(), texture.getHeight());
}

public PageButton invertSelected(boolean invert) {
this.invert = invert;
return getThis();
}

public boolean invertSelected() {
return this.invert;
}
}
13 changes: 12 additions & 1 deletion src/main/java/com/cleanroommc/modularui/widgets/ToggleButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@

public class ToggleButton extends AbstractCycleButtonWidget<ToggleButton> {

private boolean invert = false;

public ToggleButton() {
stateCount(2);
}

@Override
public WidgetTheme getWidgetThemeInternal(ITheme theme) {
WidgetThemeSelectable widgetTheme = theme.getToggleButtonTheme();
return isValueSelected() ? widgetTheme.getSelected() : widgetTheme;
return isValueSelected() ^ invertSelected() ? widgetTheme.getSelected() : widgetTheme;
}

public boolean isValueSelected() {
Expand Down Expand Up @@ -82,4 +84,13 @@ public ToggleButton tooltip(boolean selected, Consumer<RichTooltip> builder) {
public ToggleButton tooltipBuilder(boolean selected, Consumer<RichTooltip> builder) {
return super.tooltipBuilder(selected ? 1 : 0, builder);
}

public ToggleButton invertSelected(boolean invert) {
this.invert = invert;
return getThis();
}

public boolean invertSelected() {
return this.invert;
}
}