forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minigui on windows flicker and minor draw bugs when resizing

This commit is contained in:
Adam D. Ruppe 2023-12-06 13:04:19 -05:00
parent 6d1080b58d
commit 339d89d4b7
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
minigui.d
View File

@ -1599,7 +1599,8 @@ class Widget : ReflectableProperties {
version(win32_widgets) { version(win32_widgets) {
if(hwnd) { if(hwnd) {
auto pos = getChildPositionRelativeToParentHwnd(this); auto pos = getChildPositionRelativeToParentHwnd(this);
MoveWindow(hwnd, pos[0], pos[1], width, height, false); // setting this to false can sometimes speed things up but only if it is actually drawn later and that's kinda iffy to do right here so being slower but safer rn MoveWindow(hwnd, pos[0], pos[1], width, height, true); // setting this to false can sometimes speed things up but only if it is actually drawn later and that's kinda iffy to do right here so being slower but safer rn
this.redraw();
} }
} }
sendResizeEvent(); sendResizeEvent();
@ -3675,7 +3676,7 @@ struct WidgetPainter {
static @property void visualTheme(BaseVisualTheme theme) { static @property void visualTheme(BaseVisualTheme theme) {
_visualTheme = theme; _visualTheme = theme;
// FIXME: notify all windows about the new theme // FIXME: notify all windows about the new theme, they should recompute layout and redraw.
} }
/// ditto /// ditto
@ -5104,7 +5105,7 @@ class ScrollableWidget : Widget {
version(custom_widgets) { version(custom_widgets) {
if(showingVerticalScroll || showingHorizontalScroll) { if(showingVerticalScroll || showingHorizontalScroll) {
outerContainer.recomputeChildLayout(); outerContainer.queueRecomputeChildLayout();
} }
if(showingVerticalScroll()) if(showingVerticalScroll())
@ -5112,7 +5113,7 @@ class ScrollableWidget : Widget {
if(showingHorizontalScroll()) if(showingHorizontalScroll())
outerContainer.horizontalScrollBar.redraw(); outerContainer.horizontalScrollBar.redraw();
} else version(win32_widgets) { } else version(win32_widgets) {
recomputeChildLayout(); queueRecomputeChildLayout();
} else static assert(0); } else static assert(0);
} }
@ -5284,6 +5285,12 @@ private mixin template ScrollableChildren() {
paintFrameAndBackground(painter); paintFrameAndBackground(painter);
} }
/+
version(win32_widgets) {
if(hwnd) RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW);// | RDW_ALLCHILDREN | RDW_UPDATENOW);
}
+/
painter.originX = painter.originX - scrollOrigin.x; painter.originX = painter.originX - scrollOrigin.x;
painter.originY = painter.originY - scrollOrigin.y; painter.originY = painter.originY - scrollOrigin.y;
if(force || redrawRequested) { if(force || redrawRequested) {
@ -5306,6 +5313,7 @@ private mixin template ScrollableChildren() {
actuallyPainted = true; actuallyPainted = true;
redrawRequested = false; redrawRequested = false;
} }
foreach(child; children) { foreach(child; children) {
if(cast(FixedPosition) child) if(cast(FixedPosition) child)
child.privatePaint(painter, painter.originX + scrollOrigin.x, painter.originY + scrollOrigin.y, clip, actuallyPainted, invalidate); child.privatePaint(painter, painter.originX + scrollOrigin.x, painter.originY + scrollOrigin.y, clip, actuallyPainted, invalidate);
@ -7172,7 +7180,7 @@ class PageWidget : Widget {
foreach(idx, child; children) foreach(idx, child; children)
if(idx == item) { if(idx == item) {
child.show(); child.show();
child.recomputeChildLayout(); child.queueRecomputeChildLayout();
} else { } else {
child.hide(); child.hide();
} }
@ -7816,7 +7824,7 @@ class ScrollMessageWidget : Widget {
magic = false; magic = false;
scope(exit) magic = true; scope(exit) magic = true;
this.header = new Widget(this); this.header = new Widget(this);
recomputeChildLayout(); queueRecomputeChildLayout();
} }
return this.header; return this.header;
} }
@ -8097,7 +8105,6 @@ class Window : Widget {
} }
auto painter = w.draw(true); auto painter = w.draw(true);
privatePaint(WidgetPainter(painter, this), lox, loy, Rectangle(0, 0, int.max, int.max), false, willDraw()); privatePaint(WidgetPainter(painter, this), lox, loy, Rectangle(0, 0, int.max, int.max), false, willDraw());
// RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN);
} }
@ -8152,7 +8159,7 @@ class Window : Widget {
win.windowResized = (int w, int h) { win.windowResized = (int w, int h) {
this.width = w; this.width = w;
this.height = h; this.height = h;
recomputeChildLayout(); queueRecomputeChildLayout();
// this causes a HUGE performance problem for no apparent benefit, hence the commenting // this causes a HUGE performance problem for no apparent benefit, hence the commenting
//version(win32_widgets) //version(win32_widgets)
//InvalidateRect(hwnd, null, true); //InvalidateRect(hwnd, null, true);
@ -8661,7 +8668,7 @@ class Window : Widget {
bool rd = false; bool rd = false;
if(firstShow) { if(firstShow) {
firstShow = false; firstShow = false;
recomputeChildLayout(); queueRecomputeChildLayout();
auto f = getFirstFocusable(this); // FIXME: autofocus? auto f = getFirstFocusable(this); // FIXME: autofocus?
if(f) if(f)
f.focus(); f.focus();
@ -9979,7 +9986,7 @@ class MainWindow : Window {
MenuBar menuBar(MenuBar m) { MenuBar menuBar(MenuBar m) {
if(m is _menu) { if(m is _menu) {
version(custom_widgets) version(custom_widgets)
recomputeChildLayout(); queueRecomputeChildLayout();
return m; return m;
} }
@ -9998,7 +10005,7 @@ class MainWindow : Window {
// clientArea.y = menu.height; // clientArea.y = menu.height;
// clientArea.height = this.height - menu.height; // clientArea.height = this.height - menu.height;
recomputeChildLayout(); queueRecomputeChildLayout();
} else static assert(false); } else static assert(false);
return _menu; return _menu;
@ -10086,7 +10093,7 @@ class ToolBar : Widget {
idealHeight = useLarge ? 34 : 26; idealHeight = useLarge ? 34 : 26;
if(parent) { if(parent) {
parent.recomputeChildLayout(); parent.queueRecomputeChildLayout();
parent.redraw(); parent.redraw();
} }
@ -10420,7 +10427,7 @@ class StatusBar : Widget {
p.idx = cast(int) owner.partsArray.length; p.idx = cast(int) owner.partsArray.length;
owner.partsArray ~= p; owner.partsArray ~= p;
owner.recomputeChildLayout(); owner.queueRecomputeChildLayout();
version(win32_widgets) { version(win32_widgets) {
int[256] pos; int[256] pos;
@ -10965,7 +10972,7 @@ class Menu : Window {
// hacking it to get the ideal height out of recomputeChildLayout // hacking it to get the ideal height out of recomputeChildLayout
this.width = w; this.width = w;
this.height = h; this.height = h;
this.recomputeChildLayout(); this.recomputeChildLayoutEntry();
h = this.children[$-1].y + this.children[$-1].height + this.children[$-1].marginBottom; h = this.children[$-1].y + this.children[$-1].height + this.children[$-1].marginBottom;
h += paddingBottom; h += paddingBottom;
@ -10982,7 +10989,7 @@ class Menu : Window {
this.width = dropDown.width; this.width = dropDown.width;
this.height = dropDown.height; this.height = dropDown.height;
this.drawableWindow = dropDown; this.drawableWindow = dropDown;
this.recomputeChildLayout(); this.recomputeChildLayoutEntry();
static if(UsingSimpledisplayX11) static if(UsingSimpledisplayX11)
XSync(XDisplayConnection.get, 0); XSync(XDisplayConnection.get, 0);

16
simpledisplay.d
View File

@ -12277,6 +12277,8 @@ version(Windows) {
// nothing relevant changed, don't bother redrawing // nothing relevant changed, don't bother redrawing
if(oldWidth == _width && oldHeight == _height) { if(oldWidth == _width && oldHeight == _height) {
if(msg == 0x0232)
goto finalize_resize;
break; break;
} }
@ -12334,13 +12336,23 @@ version(Windows) {
if(windowResized !is null) if(windowResized !is null)
windowResized(_width, _height); windowResized(_width, _height);
/+
if(inSizeMove) { if(inSizeMove) {
SimpleWindow.processAllCustomEvents(); // SimpleWindow.processAllCustomEvents();
SimpleWindow.processAllCustomEvents(); // SimpleWindow.processAllCustomEvents();
//RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN);
//sdpyPrintDebugString("redraw b");
} else { } else {
+/ {
finalize_resize:
// when it is all done, make sure everything is freshly drawn or there might be // when it is all done, make sure everything is freshly drawn or there might be
// weird bugs left. // weird bugs left.
SimpleWindow.processAllCustomEvents();
SimpleWindow.processAllCustomEvents();
RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN);
// sdpyPrintDebugString("redraw");
} }
oldWidth = this._width; oldWidth = this._width;