From 46ada1d2fb509230aa840499bbb7bc14a987279e Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 31 Jul 2019 09:54:22 +0000 Subject: [PATCH] CtrlCore: Closing window now resets it visibility to true git-svn-id: svn://ultimatepp.org/upp/trunk@13518 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/Ctrl.cpp | 3 +-- uppsrc/CtrlCore/Win32Wnd.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp index 12b94fb19..0784532d2 100644 --- a/uppsrc/CtrlCore/Ctrl.cpp +++ b/uppsrc/CtrlCore/Ctrl.cpp @@ -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; } diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp index 40614eace..ea2e68fc6 100644 --- a/uppsrc/CtrlCore/Win32Wnd.cpp +++ b/uppsrc/CtrlCore/Win32Wnd.cpp @@ -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,