Renamed RenderingBoLayer
This commit is contained in:
@@ -53,7 +53,7 @@ public class Window extends Container {
|
|||||||
.setThickBorder(true)
|
.setThickBorder(true)
|
||||||
.withDimensionAbsolute(this.area.getDimension())
|
.withDimensionAbsolute(this.area.getDimension())
|
||||||
.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
|
.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
|
||||||
.setLayer(RenderingBoLayer.UI0_BGR);
|
.setLayer(RenderingBoLayer.UI_BGR);
|
||||||
this.rendererWorkingSet.put(this.id, windowFrame);
|
this.rendererWorkingSet.put(this.id, windowFrame);
|
||||||
|
|
||||||
if (this.closeButton) {
|
if (this.closeButton) {
|
||||||
@@ -65,7 +65,7 @@ public class Window extends Container {
|
|||||||
.setVisible(true)
|
.setVisible(true)
|
||||||
.withDimensionAbsolute(this.area.getDimension())
|
.withDimensionAbsolute(this.area.getDimension())
|
||||||
.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
|
.withPositionAbsoluteAnchorTopLeft(this.area.getPosition())
|
||||||
.setLayer(RenderingBoLayer.UI0_1);
|
.setLayer(RenderingBoLayer.UI1);
|
||||||
this.rendererWorkingSet.put(this.id, closeButtonBo);
|
this.rendererWorkingSet.put(this.id, closeButtonBo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class ScrollBar {
|
|||||||
|
|
||||||
private int lastNumElements;
|
private int lastNumElements;
|
||||||
|
|
||||||
private RenderingBoLayer layer = RenderingBoLayer.UI0_1;
|
private RenderingBoLayer layer = RenderingBoLayer.UI1;
|
||||||
|
|
||||||
public ScrollBar(final String nameSuffix) {
|
public ScrollBar(final String nameSuffix) {
|
||||||
this.name = "Scrollbar_" + nameSuffix;
|
this.name = "Scrollbar_" + nameSuffix;
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ public class Window implements HasPositionAndDimension2, AutoCloseable {
|
|||||||
bo.setLayer(RenderingBoLayer.values()[Math.min(this.renderingBoLayer.ordinal() + 2, RenderingBoLayer.values().length - 1)]);
|
bo.setLayer(RenderingBoLayer.values()[Math.min(this.renderingBoLayer.ordinal() + 2, RenderingBoLayer.values().length - 1)]);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bo.setLayer(RenderingBoLayer.UI0_1);
|
bo.setLayer(RenderingBoLayer.UI1);
|
||||||
}
|
}
|
||||||
consumer.accept(renderingBo, bo);
|
consumer.accept(renderingBo, bo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class G2DDrawEffect extends G2DAbstractRenderingBo implements DrawEffectR
|
|||||||
private String customString0;
|
private String customString0;
|
||||||
|
|
||||||
public G2DDrawEffect() {
|
public G2DDrawEffect() {
|
||||||
super(RenderingBoLayer.UI0_2);
|
super(RenderingBoLayer.UI2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class G2DDrawFont extends G2DAbstractRenderingBo implements DrawFontRende
|
|||||||
private HorizontalAlignment alignment = HorizontalAlignment.LEFT;
|
private HorizontalAlignment alignment = HorizontalAlignment.LEFT;
|
||||||
|
|
||||||
public G2DDrawFont() {
|
public G2DDrawFont() {
|
||||||
super(RenderingBoLayer.UI0_0);
|
super(RenderingBoLayer.UI0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class G2DDrawImage extends G2DAbstractRenderingBo implements DrawImageRen
|
|||||||
private int scaledY;
|
private int scaledY;
|
||||||
|
|
||||||
public G2DDrawImage() {
|
public G2DDrawImage() {
|
||||||
super(RenderingBoLayer.BACKGROUND1);
|
super(RenderingBoLayer.UI0);
|
||||||
|
|
||||||
this.transparency = 1.0f;
|
this.transparency = 1.0f;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public class G2DDrawTest extends G2DAbstractRenderingBo implements DrawTestRende
|
|||||||
}
|
}
|
||||||
|
|
||||||
public G2DDrawTest() {
|
public G2DDrawTest() {
|
||||||
super(RenderingBoLayer.UI0_1);
|
super(RenderingBoLayer.UI1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class G2DDrawWindow extends G2DAbstractRenderingBo implements DrawWindowR
|
|||||||
private boolean thickBorder;
|
private boolean thickBorder;
|
||||||
|
|
||||||
public G2DDrawWindow() {
|
public G2DDrawWindow() {
|
||||||
super(RenderingBoLayer.UI0_BGR);
|
super(RenderingBoLayer.UI_BGR);
|
||||||
|
|
||||||
this.color = COLOR_WINDOW;
|
this.color = COLOR_WINDOW;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class G2DDrawWindow2 extends G2DAbstractRenderingBo implements DrawWindow
|
|||||||
private Color awtColor;
|
private Color awtColor;
|
||||||
|
|
||||||
public G2DDrawWindow2() {
|
public G2DDrawWindow2() {
|
||||||
super(RenderingBoLayer.UI0_BGR);
|
super(RenderingBoLayer.UI_BGR);
|
||||||
|
|
||||||
this.color = COLOR_WINDOW_BGR;
|
this.color = COLOR_WINDOW_BGR;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen
|
|||||||
private String tooltip;
|
private String tooltip;
|
||||||
|
|
||||||
public G2DDrawControl() {
|
public G2DDrawControl() {
|
||||||
super(RenderingBoLayer.UI0_0);
|
super(RenderingBoLayer.UI0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -4,16 +4,14 @@ public enum RenderingBoLayer {
|
|||||||
|
|
||||||
BACKGROUND0,
|
BACKGROUND0,
|
||||||
BACKGROUND1,
|
BACKGROUND1,
|
||||||
UI0_BGR,
|
BACKGROUND2,
|
||||||
UI0_0,
|
FOREGROUND0,
|
||||||
UI0_1,
|
FOREGROUND1,
|
||||||
UI0_2,
|
FOREGROUND2,
|
||||||
UI1_BGR,
|
UI_BGR,
|
||||||
UI1_0,
|
UI0,
|
||||||
UI1_1,
|
UI1,
|
||||||
UI2_BGR,
|
UI2,
|
||||||
UI2_0,
|
|
||||||
UI2_1,
|
|
||||||
TOP;
|
TOP;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public class DemoModule extends AbstractClientModule {
|
|||||||
bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Logo", DrawImageRenderingBo.class)
|
bo = this.renderingBoPool.acquire("DemoModule_MainWindow_Logo", DrawImageRenderingBo.class)
|
||||||
.setResource(new StaticResource(List.of("renderer"), "logo.png"))
|
.setResource(new StaticResource(List.of("renderer"), "logo.png"))
|
||||||
.withDimensionAbsolute(256, 256)
|
.withDimensionAbsolute(256, 256)
|
||||||
.setLayer(RenderingBoLayer.UI0_0)
|
.setLayer(RenderingBoLayer.UI0)
|
||||||
.withPositionRelative((this.mainWindow.getNormalizedDimension().getX() - 256) / 2, 200);
|
.withPositionRelative((this.mainWindow.getNormalizedDimension().getX() - 256) / 2, 200);
|
||||||
this.mainWindow.putRenderingBo(bo);
|
this.mainWindow.putRenderingBo(bo);
|
||||||
|
|
||||||
|
|||||||
@@ -424,7 +424,7 @@ public class RendererWorkingSetImplTest {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RenderingBoLayer getLayer() {
|
public RenderingBoLayer getLayer() {
|
||||||
return RenderingBoLayer.UI0_0;
|
return RenderingBoLayer.UI0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user