mirror of https://github.com/buggins/dlangui.git
Support window resize/add scrollbars when content is too big on win32.
This commit is contained in:
parent
b2676e83c2
commit
baec5e04b4
|
@ -432,17 +432,13 @@ class Win32Window : Window {
|
||||||
_mainWidget = new Widget();
|
_mainWidget = new Widget();
|
||||||
}
|
}
|
||||||
ReleaseCapture();
|
ReleaseCapture();
|
||||||
if (!(_flags & WindowFlag.Resizable) && _mainWidget) {
|
|
||||||
|
if (_mainWidget) {
|
||||||
_mainWidget.measure(SIZE_UNSPECIFIED, SIZE_UNSPECIFIED);
|
_mainWidget.measure(SIZE_UNSPECIFIED, SIZE_UNSPECIFIED);
|
||||||
int dx = _mainWidget.measuredWidth;
|
adjustWindowOrContentSize(_mainWidget.measuredWidth, _mainWidget.measuredHeight);
|
||||||
int dy = _mainWidget.measuredHeight;
|
|
||||||
dx += 2 * GetSystemMetrics(SM_CXDLGFRAME);
|
|
||||||
dy += GetSystemMetrics(SM_CYCAPTION) + 2 * GetSystemMetrics(SM_CYDLGFRAME);
|
|
||||||
// TODO: ensure size less than screen size
|
|
||||||
SetWindowPos(_hwnd, HWND_TOP, 0, 0, dx, dy, SWP_NOMOVE| SWP_SHOWWINDOW);
|
|
||||||
} else {
|
|
||||||
ShowWindow(_hwnd, SW_SHOWNORMAL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ShowWindow(_hwnd, SW_SHOWNORMAL);
|
||||||
if (_mainWidget)
|
if (_mainWidget)
|
||||||
_mainWidget.setFocus();
|
_mainWidget.setFocus();
|
||||||
SetFocus(_hwnd);
|
SetFocus(_hwnd);
|
||||||
|
|
Loading…
Reference in New Issue