Skip to content

Commit e0f7bdb

Browse files
author
realPaulsen
committed
v1.1.2d
* Fixed: Visual- & Event-Bugs when disabling PUIScrollPanel, PUISlider & PUIText * Added small enabled-demonstration in Demo
1 parent 5c58f35 commit e0f7bdb

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

src/com/paulsen/demo/Demo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ public void run(PUIElement that) {
5050
PUIElement.darkUIMode = !PUIElement.darkUIMode;
5151
if (PUIElement.darkUIMode) {
5252
darkmodeButton.setText("DARK");
53+
sp.setEnabled(false); // set any Element as disabled -> No more Interaction and no Visuals with this Element
5354
} else {
5455
darkmodeButton.setText("LIGHT");
56+
sp.setEnabled(true);
5557
}
5658
}
5759
});

src/com/paulsen/ui/PUIScrollPanel.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ private void init() {
5050
@Override
5151
public void mouseWheelMoved(MouseWheelEvent e) {
5252
try {
53+
if (!isEnabled())
54+
return;
55+
5356
hovered = contains(e.getPoint());
5457
if (useMouseWheel && isHovered()) {
5558
if (showedElements < elements.size()) {
@@ -69,6 +72,9 @@ public void mouseWheelMoved(MouseWheelEvent e) {
6972
slider.addValueUpdateAction(new Runnable() {
7073
@Override
7174
public void run() {
75+
if (!isEnabled())
76+
return;
77+
7278
updateElements();
7379
runAllValueUpdateActions();
7480
}
@@ -123,7 +129,8 @@ public synchronized void updateElements() {
123129
e.setBounds((int) (x + eWidth * i + elementSpace_Left), y + elementSpace_Top, (int) eWidth - elementSpace_Left - elementSpace_Right, h - sliderWidth - elementSpace_Top - elementSpace_Bottom);
124130

125131
}
126-
elements.get(i + showIndex).setEnabled(true);
132+
if (isEnabled())
133+
elements.get(i + showIndex).setEnabled(true);
127134
}
128135
} else { // freely
129136

@@ -203,6 +210,7 @@ public void addElement(PUIElement element) {
203210
elements.add(element);
204211
element.doPaintOverOnHover(false);
205212
element.doPaintOverOnPress(false);
213+
element.setLayer(getInteractionLayer());
206214
PUIElement.registeredElements.remove(element);
207215
updateElements();
208216
}
@@ -243,6 +251,9 @@ public void setEnabled(boolean enabled) {
243251

244252
@Override
245253
public void draw(Graphics2D g) {
254+
if (!isEnabled())
255+
return;
256+
246257
try {
247258
super.draw(g);
248259
if (slider != null)
@@ -341,4 +352,5 @@ public void setAlignment(ElementAlignment alignment) {
341352
slider.setAlignment(ElementAlignment.VERTICAL);
342353
updateElements();
343354
}
355+
344356
}

src/com/paulsen/ui/PUISlider.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ private void setSliderValue(Point mousePos) {
9292
}
9393
}
9494

95+
@Override
96+
public void setEnabled(boolean enabled){
97+
super.setEnabled(enabled);
98+
sliderB.setEnabled(enabled);
99+
}
100+
95101
@Override
96102
public void setBounds(int x, int y, int w, int h) {
97103
super.setBounds(x, y, w, h);

src/com/paulsen/ui/PUIText.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,9 @@ public static int getTextHeight(int width, int stringLength) {
171171

172172
@Override
173173
public void draw(Graphics2D g) {
174-
if (g == null)
174+
if (g == null || !isEnabled())
175175
return;
176+
176177
super.draw(g);
177178
g.setClip(x, y, w, h);
178179
drawText(g);

0 commit comments

Comments
 (0)