mirror of https://github.com/adamdruppe/arsd.git
center support
This commit is contained in:
parent
1bd7364676
commit
d15c7997b6
21
minigui.d
21
minigui.d
|
@ -3428,6 +3428,7 @@ class Window : Widget {
|
||||||
mouseLastDownOn = ele;
|
mouseLastDownOn = ele;
|
||||||
auto event = new Event("mousedown", ele);
|
auto event = new Event("mousedown", ele);
|
||||||
event.button = ev.button;
|
event.button = ev.button;
|
||||||
|
event.buttonLinear = ev.buttonLinear;
|
||||||
event.state = ev.modifierState;
|
event.state = ev.modifierState;
|
||||||
event.clientX = eleR.x;
|
event.clientX = eleR.x;
|
||||||
event.clientY = eleR.y;
|
event.clientY = eleR.y;
|
||||||
|
@ -3435,6 +3436,7 @@ class Window : Widget {
|
||||||
} else if(ev.type == 2) {
|
} else if(ev.type == 2) {
|
||||||
auto event = new Event("mouseup", ele);
|
auto event = new Event("mouseup", ele);
|
||||||
event.button = ev.button;
|
event.button = ev.button;
|
||||||
|
event.buttonLinear = ev.buttonLinear;
|
||||||
event.clientX = eleR.x;
|
event.clientX = eleR.x;
|
||||||
event.clientY = eleR.y;
|
event.clientY = eleR.y;
|
||||||
event.state = ev.modifierState;
|
event.state = ev.modifierState;
|
||||||
|
@ -3444,6 +3446,7 @@ class Window : Widget {
|
||||||
event.clientX = eleR.x;
|
event.clientX = eleR.x;
|
||||||
event.clientY = eleR.y;
|
event.clientY = eleR.y;
|
||||||
event.button = ev.button;
|
event.button = ev.button;
|
||||||
|
event.buttonLinear = ev.buttonLinear;
|
||||||
event.dispatch();
|
event.dispatch();
|
||||||
}
|
}
|
||||||
} else if(ev.type == 0) {
|
} else if(ev.type == 0) {
|
||||||
|
@ -4851,8 +4854,6 @@ class Checkbox : MouseActivatedWidget {
|
||||||
|
|
||||||
/// Adds empty space to a layout.
|
/// Adds empty space to a layout.
|
||||||
class VerticalSpacer : Widget {
|
class VerticalSpacer : Widget {
|
||||||
override int maxHeight() { return 20; }
|
|
||||||
override int minHeight() { return 20; }
|
|
||||||
///
|
///
|
||||||
this(Widget parent = null) {
|
this(Widget parent = null) {
|
||||||
super(parent);
|
super(parent);
|
||||||
|
@ -4861,8 +4862,6 @@ class VerticalSpacer : Widget {
|
||||||
|
|
||||||
/// ditto
|
/// ditto
|
||||||
class HorizontalSpacer : Widget {
|
class HorizontalSpacer : Widget {
|
||||||
override int maxWidth() { return 20; }
|
|
||||||
override int minWidth() { return 20; }
|
|
||||||
///
|
///
|
||||||
this(Widget parent = null) {
|
this(Widget parent = null) {
|
||||||
super(parent);
|
super(parent);
|
||||||
|
@ -5139,13 +5138,24 @@ class TextLabel : Widget {
|
||||||
///
|
///
|
||||||
this(string label, Widget parent = null) {
|
this(string label, Widget parent = null) {
|
||||||
this.label_ = label;
|
this.label_ = label;
|
||||||
|
this.alignment = TextAlignment.Right;
|
||||||
this.tabStop = false;
|
this.tabStop = false;
|
||||||
super(parent);
|
super(parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///
|
||||||
|
this(string label, TextAlignment alignment, Widget parent = null) {
|
||||||
|
this.label_ = label;
|
||||||
|
this.alignment = alignment;
|
||||||
|
this.tabStop = false;
|
||||||
|
super(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
TextAlignment alignment;
|
||||||
|
|
||||||
override void paint(ScreenPainter painter) {
|
override void paint(ScreenPainter painter) {
|
||||||
painter.outlineColor = Color.black;
|
painter.outlineColor = Color.black;
|
||||||
painter.drawText(Point(0, 0), this.label, Point(width,height), TextAlignment.Right);
|
painter.drawText(Point(0, 0), this.label, Point(width,height), alignment);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -5595,6 +5605,7 @@ class Event {
|
||||||
int viewportY; ///
|
int viewportY; ///
|
||||||
|
|
||||||
int button; ///
|
int button; ///
|
||||||
|
int buttonLinear; ///
|
||||||
|
|
||||||
// for key events
|
// for key events
|
||||||
Key key; ///
|
Key key; ///
|
||||||
|
|
Loading…
Reference in New Issue