chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Add support for modal dialogs

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-03-18 17:48:30 +02:00
parent 5252c95fd6
commit f9926a0ef9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Common/Dialog.cpp
View File

@ -35,7 +35,7 @@ CBaseDialog::CBaseDialog() :
** Create (if not already) and show the dialog. ** Create (if not already) and show the dialog.
** **
*/ */
void CBaseDialog::Show(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent) void CBaseDialog::Show(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent, bool modeless)
{ {
if (m_Window) if (m_Window)
{ {
@ -86,7 +86,14 @@ void CBaseDialog::Show(const WCHAR* title, short x, short y, short w, short h, D
// Font array. // Font array.
memcpy(dtExtra, font, fontSize); memcpy(dtExtra, font, fontSize);
CreateDialogIndirectParam(NULL, dt, parent, InitialDlgProc, (LPARAM)this); if (modeless)
{
CreateDialogIndirectParam(NULL, dt, parent, InitialDlgProc, (LPARAM)this);
}
else
{
DialogBoxIndirectParam(NULL, dt, parent, InitialDlgProc, (LPARAM)this);
}
delete [] dt; delete [] dt;
} }
@ -140,9 +147,9 @@ CDialog::~CDialog()
DeleteObject(m_FontBold); DeleteObject(m_FontBold);
} }
void CDialog::ShowDialogWindow(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent) void CDialog::ShowDialogWindow(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent, bool modeless)
{ {
Show(title, x, y, w, h, style, exStyle, parent); Show(title, x, y, w, h, style, exStyle, parent, modeless);
} }
INT_PTR CDialog::OnActivate(WPARAM wParam, LPARAM lParam) INT_PTR CDialog::OnActivate(WPARAM wParam, LPARAM lParam)
@ -232,7 +239,7 @@ void CDialog::CTab::CreateTabWindow(short x, short y, short w, short h, HWND own
{ {
const DWORD style = DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; const DWORD style = DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS;
const DWORD exStyle = WS_EX_CONTROLPARENT; const DWORD exStyle = WS_EX_CONTROLPARENT;
Show(L"", x, y, w, h, style, exStyle, owner); Show(L"", x, y, w, h, style, exStyle, owner, true);
EnableThemeDialogTexture(m_Window, ETDT_ENABLETAB); EnableThemeDialogTexture(m_Window, ETDT_ENABLETAB);
} }

4
Common/Dialog.h
View File

@ -32,7 +32,7 @@ protected:
CBaseDialog(); CBaseDialog();
virtual ~CBaseDialog() {} virtual ~CBaseDialog() {}
void Show(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent); void Show(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent, bool modeless);
void CreateControls(const ControlTemplate::Control* cts, UINT ctCount, HFONT font, ControlTemplate::GetStringFunc getString); void CreateControls(const ControlTemplate::Control* cts, UINT ctCount, HFONT font, ControlTemplate::GetStringFunc getString);
@ -77,7 +77,7 @@ protected:
CDialog(); CDialog();
virtual ~CDialog(); virtual ~CDialog();
void ShowDialogWindow(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent); void ShowDialogWindow(const WCHAR* title, short x, short y, short w, short h, DWORD style, DWORD exStyle, HWND parent, bool modeless = true);
INT_PTR OnActivate(WPARAM wParam, LPARAM lParam); INT_PTR OnActivate(WPARAM wParam, LPARAM lParam);