github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Closing window now resets it visibility to true

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13518 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-07-31 09:54:22 +00:00
parent e563838a9c
commit 46ada1d2fb
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -662,10 +662,9 @@ void Ctrl::Close()
DoRemove();
if(parent) return;
StateH(CLOSE);
bool vis = visible;
USRLOG(" CLOSE " + Desc(this));
WndDestroy();
visible = vis;
visible = true;
popup = false;
}

6
uppsrc/CtrlCore/Win32Wnd.cpp
View file

@ -500,13 +500,13 @@ void Ctrl::Create(HWND parent, DWORD style, DWORD exstyle, bool savebits, int sh
if(IsWinNT() && (!parent || IsWindowUnicode(parent)))
top->hwnd = CreateWindowExW(exstyle,
savebits ? dropshadow ? L"UPP-CLASS-SB-DS-W" : L"UPP-CLASS-SB-W"
: dropshadow ? L"UPP-CLASS-DS-W" : L"UPP-CLASS-W",
: dropshadow ? L"UPP-CLASS-DS-W" : L"UPP-CLASS-W",
L"", style, 0, 0, 0, 0,
parent, NULL, hInstance, this);
else
top->hwnd = CreateWindowEx(exstyle,
savebits ? dropshadow ? "UPP-CLASS-SB-DS-A" : "UPP-CLASS-SB-A"
: dropshadow ? "UPP-CLASS-DS-A" : "UPP-CLASS-A",
: dropshadow ? "UPP-CLASS-DS-A" : "UPP-CLASS-A",
"", style, 0, 0, 0, 0,
parent, NULL, hInstance, this);
@ -1255,7 +1255,7 @@ void Ctrl::WndScrollView(const Rect& r, int dx, int dy)
void Ctrl::PopUpHWND(HWND owner, bool savebits, bool activate, bool dropshadow, bool topmost)
{
LLOG("PopoUp " << UPP::Name(this));
LLOG("PopUpHWND " << UPP::Name(this) << ", owner: " << owner);
popup = false;
Create(owner, WS_POPUP, topmost ? WS_EX_TOPMOST : 0, savebits,
owner || !activate ? SW_SHOWNOACTIVATE : SW_SHOW,