Amebis/wxExtend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial redraw, and Aero Snap issues fixed

Browse Source
This commit is contained in:
Simon Rozman 2016-02-04 14:31:31 +01:00
parent 120d718da5
commit 7e80cf443c
2 changed files with 109 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
include/wxex/appbar.h
View File

@ -53,29 +53,31 @@ public:
/// Application bar flags /// Application bar flags
/// ///
enum wxFlags { enum wxFlags {
wxFLAG_ALLOWFLOAT = 1 << 0, ///< Is floating application bar allowed? wxFLAG_ALLOWFLOAT = 1 << 0, ///< Is floating application bar allowed?
wxFLAG_ALLOWDOCKTOP = 1 << 1, ///< Is docking on top of the screen allowed? wxFLAG_ALLOWDOCKTOP = 1 << 1, ///< Is docking on top of the screen allowed?
wxFLAG_ALLOWDOCKBOTTOM = 1 << 2, ///< Is docking on bottom of the screen allowed? wxFLAG_ALLOWDOCKBOTTOM = 1 << 2, ///< Is docking on bottom of the screen allowed?
wxFLAG_ALLOWDOCKLEFT = 1 << 3, ///< Is docking left of the screen allowed? wxFLAG_ALLOWDOCKLEFT = 1 << 3, ///< Is docking left of the screen allowed?
wxFLAG_ALLOWDOCKRIGHT = 1 << 4, ///< Is docking right of the screen allowed? wxFLAG_ALLOWDOCKRIGHT = 1 << 4, ///< Is docking right of the screen allowed?
wxFLAG_ALLOWDOCKANY = (wxFLAG_ALLOWDOCKTOP | wxFLAG_ALLOWDOCKBOTTOM | wxFLAG_ALLOWDOCKLEFT | wxFLAG_ALLOWDOCKRIGHT), ///< Is docking at any edge of the screen allowed?
wxFLAG_ALLOWDOCKHORIZONTAL = (wxFLAG_ALLOWDOCKTOP | wxFLAG_ALLOWDOCKBOTTOM), ///< Is docking on top or bottom of the screen allowed?
wxFLAG_ALLOWDOCKVERTICAL = (wxFLAG_ALLOWDOCKLEFT | wxFLAG_ALLOWDOCKRIGHT), ///< Is docking left or right of the screen allowed?
wxFLAG_ALLOWANY = (wxFLAG_ALLOWFLOAT | wxFLAG_ALLOWDOCKANY), ///< Is floating and docking at any edge of the screen allowed?
wxFLAG_ALWAYSONTOP = 1 << 5, ///< Is application bar always on top? wxFLAG_ALWAYSONTOP = 1 << 5, ///< Is application bar always on top?
wxFLAG_ALWAYSONTOPTASKBAR = 1 << 6, ///< Does application bar follow always on top state of the system taskbar? wxFLAG_ALWAYSONTOPTASKBAR = 1 << 6, ///< Does application bar follow always on top state of the system taskbar?
wxFLAG_AUTOHIDE = 1 << 7, ///< Is application bar setup for auto-hide? wxFLAG_AUTOHIDE = 1 << 7, ///< Is application bar setup for auto-hide?
wxFLAG_AUTOHIDETASKBAR = 1 << 8, ///< Does application bar follow auto-hide state of the system taskbar? wxFLAG_AUTOHIDETASKBAR = 1 << 8, ///< Does application bar follow auto-hide state of the system taskbar?
wxFLAG_ALLOWSIZING = 1 << 9, ///< Is application bar's sizing allowed? wxFLAG_ALLOWSIZING = 1 << 9, ///< Is application bar's sizing allowed?
wxFLAG_HIDETASKBARTABWHENFLOATING = 1 << 10, ///< Should application bar's tab on the system taskbar hide when floating?
wxFLAG_HIDETASKBARTABWHENDOCKED = 1 << 11, ///< Should application bar's tab on the system taskbar hide when docked? wxFLAG_HIDETASKBARTABWHENFLOATING = 1 << 10, ///< Should application bar's tab on the system taskbar hide when floating?
wxFLAG_HIDETASKBARTABWHENDOCKED = 1 << 11, ///< Should application bar's tab on the system taskbar hide when docked?
wxFLAG_ALWAYSHIDETASKBARTAB = (wxFLAG_HIDETASKBARTABWHENFLOATING | wxFLAG_HIDETASKBARTABWHENDOCKED), ///< Should application bar's tab on the system taskbar hide always?
// Internal flags // Internal flags
wxFLAG_FULLSCREENAPPOPEN = 1 << 12, ///< Is full-screen application open? wxFLAG_FULLSCREENAPPOPEN = 1 << 12, ///< Is full-screen application open?
wxFLAG_AUTOHIDDEN = 1 << 13, ///< Is application bar auto-hidden right now? wxFLAG_AUTOHIDDEN = 1 << 13, ///< Is application bar auto-hidden right now?
wxFLAG_POSITIONSET = 1 << 14, ///< Is application bar's position correct?
wxFLAG_ALLOWDOCKANY = (wxFLAG_ALLOWDOCKTOP | wxFLAG_ALLOWDOCKBOTTOM | wxFLAG_ALLOWDOCKLEFT | wxFLAG_ALLOWDOCKRIGHT), ///< Is docking at any edge of the screen allowed?
wxFLAG_ALLOWDOCKHORIZONTAL = (wxFLAG_ALLOWDOCKTOP | wxFLAG_ALLOWDOCKBOTTOM), ///< Is docking on top or bottom of the screen allowed?
wxFLAG_ALLOWDOCKVERTICAL = (wxFLAG_ALLOWDOCKLEFT | wxFLAG_ALLOWDOCKRIGHT), ///< Is docking left or right of the screen allowed?
wxFLAG_ALLOWANY = (wxFLAG_ALLOWFLOAT | wxFLAG_ALLOWDOCKANY), ///< Is floating and docking at any edge of the screen allowed?
wxFLAG_ALWAYSHIDETASKBARTAB = (wxFLAG_HIDETASKBARTABWHENFLOATING | wxFLAG_HIDETASKBARTABWHENDOCKED), ///< Should application bar's tab on the system taskbar hide always?
}; };
public: public:
@ -173,10 +175,10 @@ public:
/// ///
/// Minimize application bar to the edge of the desktop. /// Minimize application bar to the edge of the desktop.
/// ///
/// \param[in] state The edge at which to dock. Must be either of: wxSTATE_LEFT, wxSTATE_TOP, wxSTATE_RIGHT, or wxSTATE_BOTTOM. /// \param[in] edge The edge at which to dock. Must be either of: wxSTATE_LEFT, wxSTATE_TOP, wxSTATE_RIGHT, or wxSTATE_BOTTOM.
/// \param[in] wnd When the undocked and docked window is different, this parameter denotes the undocked version. /// \param[in] wnd When the undocked and docked window is different, this parameter denotes the undocked version.
/// ///
void MinimiseToEdge(wxState state, wxWindow* wnd = NULL); void MinimiseToEdge(wxState edge, wxWindow* wnd = NULL);
/// ///
/// Restore application bar from the edge of the desktop. /// Restore application bar from the edge of the desktop.
@ -262,7 +264,6 @@ protected:
wxState m_stateDesired; ///< Desired state of the application bar while moving/resizing wxState m_stateDesired; ///< Desired state of the application bar while moving/resizing
int m_flags; ///< Flags describing application bar's behaviour int m_flags; ///< Flags describing application bar's behaviour
RECT m_rect; ///< Window rectangle
SIZE m_sizeFloat; ///< Window size when floating (we need it to restore floating size, when we undock) SIZE m_sizeFloat; ///< Window size when floating (we need it to restore floating size, when we undock)
SIZE m_sizeDocked; ///< Size of the window when docked (height when wxSTATE_TOP or wxSTATE_BOTTOM, width when wxSTATE_LEFT or wxSTATE_RIGHT) SIZE m_sizeDocked; ///< Size of the window when docked (height when wxSTATE_TOP or wxSTATE_BOTTOM, width when wxSTATE_LEFT or wxSTATE_RIGHT)
SIZE m_sizeMin; ///< Minimum window size SIZE m_sizeMin; ///< Minimum window size
@ -297,7 +298,7 @@ inline bool wxAppBar::SetAlwaysOnTop(bool alwaysOnTop)
m_flags &= ~wxFLAG_ALWAYSONTOP; m_flags &= ~wxFLAG_ALWAYSONTOP;
if (::IsWindowVisible(m_hWnd)) { if (::IsWindowVisible(m_hWnd)) {
// Set the Z-order. SWP_NOSENDCHANGING flag prevents our OnWindowPosChanging() method to be called, since moving is not necessary. // Set the Z-order.
wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(m_state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOSENDCHANGING), false); wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(m_state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOSENDCHANGING), false);
} }
@ -371,19 +372,11 @@ inline bool wxAppBar::DockAppBar(wxState state)
{ {
wxASSERT(IsDocked(state)); wxASSERT(IsDocked(state));
APPBARDATA abd = {
sizeof(abd),
m_hWnd,
0,
state
};
// Calculate docked window rect and dock the window there. // Calculate docked window rect and dock the window there.
APPBARDATA abd = { sizeof(abd), m_hWnd, 0, state };
GetDockedRect(state, &(abd.rc)); GetDockedRect(state, &(abd.rc));
wxCHECK(::SHAppBarMessage(ABM_SETPOS, &abd), false); wxCHECK(::SHAppBarMessage(ABM_SETPOS, &abd), false);
m_flags |= wxFLAG_POSITIONSET; wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(state, m_flags), abd.rc.left, abd.rc.top, abd.rc.right - abd.rc.left, abd.rc.bottom - abd.rc.top, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED), false);
m_rect = abd.rc;
wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED), false);
return true; return true;
} }
@ -391,14 +384,8 @@ inline bool wxAppBar::DockAppBar(wxState state)
inline bool wxAppBar::UndockAppBar() inline bool wxAppBar::UndockAppBar()
{ {
APPBARDATA abd = {
sizeof(abd),
m_hWnd,
0,
wxSTATE_LEFT
};
// Free application bar's space to undock. // Free application bar's space to undock.
APPBARDATA abd = { sizeof(abd), m_hWnd, 0, wxSTATE_LEFT };
wxASSERT(!abd.rc.left && !abd.rc.top && !abd.rc.right && !abd.rc.bottom); wxASSERT(!abd.rc.left && !abd.rc.top && !abd.rc.right && !abd.rc.bottom);
wxCHECK(::SHAppBarMessage(ABM_SETPOS, &abd), false); wxCHECK(::SHAppBarMessage(ABM_SETPOS, &abd), false);
@ -410,16 +397,8 @@ inline bool wxAppBar::RegisterAutoHide(wxState state)
{ {
wxASSERT(IsDocked(state)); wxASSERT(IsDocked(state));
APPBARDATA abd = {
sizeof(abd),
m_hWnd,
0,
state,
{},
(LPARAM)true
};
// Register application bar as auto-hide. // Register application bar as auto-hide.
APPBARDATA abd = { sizeof(abd), m_hWnd, 0, state, {}, (LPARAM)true };
if (::SHAppBarMessage(ABM_SETAUTOHIDEBAR, &abd)) { if (::SHAppBarMessage(ABM_SETAUTOHIDEBAR, &abd)) {
// Auto-hide succeeded. // Auto-hide succeeded.
m_flags |= wxFLAG_AUTOHIDE; m_flags |= wxFLAG_AUTOHIDE;
@ -427,9 +406,7 @@ inline bool wxAppBar::RegisterAutoHide(wxState state)
// Calculate auto-hidden window rect and move the window there. // Calculate auto-hidden window rect and move the window there.
GetAutoHideRect(state, false, &(abd.rc)); GetAutoHideRect(state, false, &(abd.rc));
m_flags |= wxFLAG_POSITIONSET; wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(state, m_flags), abd.rc.left, abd.rc.top, abd.rc.right - abd.rc.left, abd.rc.bottom - abd.rc.top, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED), false);
m_rect = abd.rc;
wxCHECK(::SetWindowPos(m_hWnd, GetZWnd(state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED), false);
// Reset auto-hide timer. // Reset auto-hide timer.
m_timerID = ::SetTimer(m_hWnd, wxABT_AUTOHIDETIMERID, wxABT_AUTOHIDETIMERINTERVAL, NULL); m_timerID = ::SetTimer(m_hWnd, wxABT_AUTOHIDETIMERID, wxABT_AUTOHIDETIMERINTERVAL, NULL);
@ -451,16 +428,8 @@ inline bool wxAppBar::UnregisterAutoHide(wxState state)
{ {
wxASSERT(IsDocked(state)); wxASSERT(IsDocked(state));
APPBARDATA abd = {
sizeof(abd),
m_hWnd,
0,
state,
{},
(LPARAM)false
};
// Unregister application bar as auto-hide. // Unregister application bar as auto-hide.
APPBARDATA abd = { sizeof(abd), m_hWnd, 0, state, {}, (LPARAM)false };
wxCHECK(::SHAppBarMessage(ABM_SETAUTOHIDEBAR, &abd), false); wxCHECK(::SHAppBarMessage(ABM_SETAUTOHIDEBAR, &abd), false);
m_flags &= ~wxFLAG_AUTOHIDDEN; m_flags &= ~wxFLAG_AUTOHIDDEN;
@ -479,20 +448,8 @@ inline bool wxAppBar::GetDockedRect(wxState state, LPRECT rect) const
wxASSERT(rect); wxASSERT(rect);
wxASSERT(IsDocked(state)); wxASSERT(IsDocked(state));
APPBARDATA abd = { // Set dimensions to full screen.
sizeof(abd), APPBARDATA abd = { sizeof(abd), m_hWnd, 0, state, { 0, 0, ::GetSystemMetrics(SM_CXSCREEN), ::GetSystemMetrics(SM_CYSCREEN) } };
m_hWnd,
0,
state,
{
// Set dimensions to full screen.
0,
0,
::GetSystemMetrics(SM_CXSCREEN),
::GetSystemMetrics(SM_CYSCREEN)
}
};
wxCHECK(::SHAppBarMessage(ABM_QUERYPOS, &abd), false); wxCHECK(::SHAppBarMessage(ABM_QUERYPOS, &abd), false);
// Correct our dimensions accordingly. // Correct our dimensions accordingly.
@ -658,6 +615,5 @@ inline WXHWND wxAppBar::GetZWnd(wxState state, int flags)
inline UINT_PTR wxAppBar::GetTaskBarState() inline UINT_PTR wxAppBar::GetTaskBarState()
{ {
APPBARDATA abd = { sizeof(abd) }; APPBARDATA abd = { sizeof(abd) };
return ::SHAppBarMessage(ABM_GETSTATE, &abd); return ::SHAppBarMessage(ABM_GETSTATE, &abd);
} }

202
src/appbar.cpp
View File

@ -46,12 +46,6 @@ wxAppBar::wxAppBar(wxWindow *parent, wxWindowID id, const wxString& title, wxSta
bool wxAppBar::Create(wxWindow *parent, wxWindowID id, const wxString& title, wxState state, int flags, const wxPoint& pos, const wxSize& size, long style, const wxString& name) bool wxAppBar::Create(wxWindow *parent, wxWindowID id, const wxString& title, wxState state, int flags, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{ {
// Save initial window rectangle.
m_rect.left = pos.x;
m_rect.top = pos.y;
m_rect.right = pos.x + size.x;
m_rect.bottom = pos.y + size.y;
// Save initial floating window size. // Save initial floating window size.
m_sizeFloat.cx = size.x; m_sizeFloat.cx = size.x;
m_sizeFloat.cy = size.y; m_sizeFloat.cy = size.y;
@ -70,14 +64,32 @@ bool wxAppBar::Create(wxWindow *parent, wxWindowID id, const wxString& title, wx
wxCHECK(SUCCEEDED(m_taskbarList->HrInit()), false); wxCHECK(SUCCEEDED(m_taskbarList->HrInit()), false);
// If any taskbar list tab's hiding is in affect, set application bar's style as tool window to avoid being displayed on the taskbar initially. // If any taskbar list tab's hiding is in affect, set application bar's style as tool window to avoid being displayed on the taskbar initially.
if (m_flags & wxFLAG_ALWAYSHIDETASKBARTAB) if (state == wxSTATE_FLOAT) {
style |= wxFRAME_TOOL_WINDOW; if (flags & wxFLAG_HIDETASKBARTABWHENFLOATING) {
// Hide our application bar's entry on the Windows's taskbar.
style |= wxFRAME_TOOL_WINDOW;
} else if (flags & wxFLAG_HIDETASKBARTABWHENDOCKED) {
// Show our application bar's entry on the Windows's taskbar.
style &= ~wxFRAME_TOOL_WINDOW;
}
} else if (IsDocked(state)) {
if (flags & wxFLAG_HIDETASKBARTABWHENDOCKED) {
// Hide our application bar's entry on the Windows's taskbar.
style |= wxFRAME_TOOL_WINDOW;
} else if (flags & wxFLAG_HIDETASKBARTABWHENFLOATING) {
// Show our application bar's entry on the Windows's taskbar.
style &= ~wxFRAME_TOOL_WINDOW;
}
} else {
// Unknown state.
wxFAIL;
}
// Create frame. // Create frame.
wxCHECK(wxFrame::Create(parent, id, title, pos, size, style, name), false); wxCHECK(wxFrame::Create(parent, id, title, pos, size, style, name), false);
// Register our application bar. // Register our application bar.
APPBARDATA abd = { sizeof(abd), m_hWnd, WM_AB_NOTIFY, m_state, }; APPBARDATA abd = { sizeof(abd), m_hWnd, WM_AB_NOTIFY, m_state };
wxCHECK(::SHAppBarMessage(ABM_NEW, &abd), false); wxCHECK(::SHAppBarMessage(ABM_NEW, &abd), false);
// Get the state of the Windows taskbar. // Get the state of the Windows taskbar.
@ -102,10 +114,7 @@ wxAppBar::~wxAppBar()
wxASSERT(m_timerID == 0); wxASSERT(m_timerID == 0);
// Remove the application bar. // Remove the application bar.
APPBARDATA abd = { APPBARDATA abd = { sizeof(abd), m_hWnd };
sizeof(abd),
m_hWnd
};
wxVERIFY(::SHAppBarMessage(ABM_REMOVE, &abd)); wxVERIFY(::SHAppBarMessage(ABM_REMOVE, &abd));
if (m_taskbarList) if (m_taskbarList)
@ -189,16 +198,17 @@ wxAppBar::~wxAppBar()
//} //}
void wxAppBar::MinimiseToEdge(wxState state, wxWindow *wnd) void wxAppBar::MinimiseToEdge(wxState edge, wxWindow *wnd)
{ {
wxASSERT(IsDocked(state)); wxASSERT(IsDocked(edge));
WXHWND hWnd;
if (!wnd) { if (!wnd) {
// No other window was specified. Minimize ourself. // No other window was specified. Minimize ourself.
wnd = this; wnd = this;
} hWnd = m_hWnd;
} else
WXHWND hWnd = wnd->GetHWND(); hWnd = wnd->GetHWND();
// If our window is hidden, there's nothing we can do. // If our window is hidden, there's nothing we can do.
if (hWnd == m_hWnd && !::IsWindowVisible(m_hWnd)) if (hWnd == m_hWnd && !::IsWindowVisible(m_hWnd))
@ -206,36 +216,28 @@ void wxAppBar::MinimiseToEdge(wxState state, wxWindow *wnd)
if (m_state == wxSTATE_FLOAT) { if (m_state == wxSTATE_FLOAT) {
// Remember the last floating size. // Remember the last floating size.
m_sizeFloat.cx = m_rect.right - m_rect.left; RECT rect = {};
m_sizeFloat.cy = m_rect.bottom - m_rect.top; wxVERIFY(::GetWindowRect(hWnd, &rect));
m_sizeFloat.cx = rect.right - rect.left;
m_sizeFloat.cy = rect.bottom - rect.top;
} }
RECT rectTo; RECT rectTo;
if (IsAutoHide()) if (IsAutoHide())
GetAutoHideRect(state, false, &rectTo); GetAutoHideRect(edge, false, &rectTo);
else else
GetDockedRect(state, &rectTo); GetDockedRect(edge, &rectTo);
if (::wxGetDoWndAnimation()) { if (::wxGetDoWndAnimation()) {
RECT rectFrom;
// Calculate source and destination rectangles.
if (hWnd != m_hWnd)
::GetWindowRect(hWnd, &rectFrom);
else
rectFrom = m_rect;
// Do the animation. // Do the animation.
RECT rectFrom;
wxVERIFY(::GetWindowRect(hWnd, &rectFrom));
wxVERIFY(::DrawAnimatedRects(hWnd, IDANI_CAPTION, &rectFrom, &rectTo)); wxVERIFY(::DrawAnimatedRects(hWnd, IDANI_CAPTION, &rectFrom, &rectTo));
} }
// Set the window rect.
m_flags |= wxFLAG_POSITIONSET;
m_rect = rectTo;
// Notify about the change of state. // Notify about the change of state.
OnChangeState(state); OnChangeState(edge);
m_state = state; m_state = edge;
if (hWnd != m_hWnd) { if (hWnd != m_hWnd) {
// Hide the source window. // Hide the source window.
@ -247,10 +249,10 @@ void wxAppBar::MinimiseToEdge(wxState state, wxWindow *wnd)
} else { } else {
if (IsAutoHide()) { if (IsAutoHide()) {
// Register auto-hide application bar. // Register auto-hide application bar.
RegisterAutoHide(state); RegisterAutoHide(edge);
} else { } else {
// Auto-hide failed or wasn't desired at all. // Auto-hide failed or wasn't desired at all.
DockAppBar(state); DockAppBar(edge);
} }
} }
@ -262,16 +264,16 @@ void wxAppBar::MaximiseFromEdge(const RECT* rect)
{ {
wxASSERT(::IsWindowVisible(m_hWnd)); wxASSERT(::IsWindowVisible(m_hWnd));
RECT rc; RECT rectTo;
if (!rect) { if (!rect) {
// Calculate the destination rect. // Calculate the destination rect.
rc.left = (::GetSystemMetrics(SM_CXSCREEN) - m_sizeFloat.cx) / 2; rectTo.left = (::GetSystemMetrics(SM_CXSCREEN) - m_sizeFloat.cx) / 2;
rc.top = (::GetSystemMetrics(SM_CYSCREEN) - m_sizeFloat.cy) / 2; rectTo.top = (::GetSystemMetrics(SM_CYSCREEN) - m_sizeFloat.cy) / 2;
rc.right = rc.left + m_sizeFloat.cx; rectTo.right = rectTo.left + m_sizeFloat.cx;
rc.bottom = rc.top + m_sizeFloat.cy; rectTo.bottom = rectTo.top + m_sizeFloat.cy;
rect = &rc; rect = &rectTo;
} else { } else {
m_sizeFloat.cx = rect->right - rect->left; m_sizeFloat.cx = rect->right - rect->left;
m_sizeFloat.cy = rect->bottom - rect->top; m_sizeFloat.cy = rect->bottom - rect->top;
@ -279,7 +281,9 @@ void wxAppBar::MaximiseFromEdge(const RECT* rect)
if (::wxGetDoWndAnimation()) { if (::wxGetDoWndAnimation()) {
// Do the animation. // Do the animation.
wxVERIFY(::DrawAnimatedRects(m_hWnd, IDANI_CAPTION, &m_rect, rect)); RECT rectFrom;
wxVERIFY(::GetWindowRect(m_hWnd, &rectFrom));
wxVERIFY(::DrawAnimatedRects(m_hWnd, IDANI_CAPTION, &rectFrom, rect));
} }
// Clean previous docking/auto-hide settings if required. // Clean previous docking/auto-hide settings if required.
@ -290,15 +294,11 @@ void wxAppBar::MaximiseFromEdge(const RECT* rect)
UndockAppBar(); UndockAppBar();
} }
// Set the window rect.
m_flags |= wxFLAG_POSITIONSET;
m_rect = *rect;
// Notify about the change of state. // Notify about the change of state.
OnChangeState(wxSTATE_FLOAT); OnChangeState(wxSTATE_FLOAT);
m_state = wxSTATE_FLOAT; m_state = wxSTATE_FLOAT;
::SetWindowPos(m_hWnd, GetZWnd(wxSTATE_FLOAT, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED); wxVERIFY(::SetWindowPos(m_hWnd, GetZWnd(wxSTATE_FLOAT, m_flags), rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_FRAMECHANGED));
} }
@ -308,20 +308,21 @@ void wxAppBar::MaximiseFromEdge(wxWindow *wnd)
wxASSERT(::IsWindowVisible(m_hWnd)); wxASSERT(::IsWindowVisible(m_hWnd));
WXHWND hWnd = wnd->GetHWND(); WXHWND hWnd = wnd->GetHWND();
RECT rectTo;
::GetWindowRect(hWnd, &rectTo); RECT rectTo = {};
wxVERIFY(::GetWindowRect(hWnd, &rectTo));
m_sizeFloat.cx = rectTo.right - rectTo.left; m_sizeFloat.cx = rectTo.right - rectTo.left;
m_sizeFloat.cy = rectTo.bottom - rectTo.top; m_sizeFloat.cy = rectTo.bottom - rectTo.top;
if (::wxGetDoWndAnimation()) { if (::wxGetDoWndAnimation()) {
// Do the animation. // Do the animation.
wxVERIFY(::DrawAnimatedRects(hWnd, IDANI_CAPTION, &m_rect, &rectTo)); RECT rectFrom;
wxVERIFY(::GetWindowRect(m_hWnd, &rectFrom));
wxVERIFY(::DrawAnimatedRects(hWnd, IDANI_CAPTION, &rectFrom, &rectTo));
} }
// Hide our window and show the destination window.
Hide(); Hide();
// Show the destination window.
wnd->Show(); wnd->Show();
// ::SetWindowLong(hWnd, GWL_STYLE, GetWindowLong(hWnd, GWL_STYLE) | WS_VISIBLE); // ::SetWindowLong(hWnd, GWL_STYLE, GetWindowLong(hWnd, GWL_STYLE) | WS_VISIBLE);
wxVERIFY(::SetForegroundWindow(hWnd)); wxVERIFY(::SetForegroundWindow(hWnd));
@ -368,34 +369,29 @@ void wxAppBar::ShowAutoHideAppBar(bool bShow)
rcDelta.right = rcEnd.right - rcStart.right; rcDelta.right = rcEnd.right - rcStart.right;
rcDelta.bottom = rcEnd.bottom - rcStart.bottom; rcDelta.bottom = rcEnd.bottom - rcStart.bottom;
m_flags |= wxFLAG_POSITIONSET;
while ((dwTimeElapsed = ::GetTickCount() - dwTimeStart) < wxABT_AUTOHIDETIME) { while ((dwTimeElapsed = ::GetTickCount() - dwTimeStart) < wxABT_AUTOHIDETIME) {
// Do the linear interpolation. // Do the linear interpolation.
m_rect.left = rcStart.left + ::MulDiv(rcDelta.left, dwTimeElapsed, wxABT_AUTOHIDETIME); RECT rect;
m_rect.top = rcStart.top + ::MulDiv(rcDelta.top, dwTimeElapsed, wxABT_AUTOHIDETIME); rect.left = rcStart.left + ::MulDiv(rcDelta.left, dwTimeElapsed, wxABT_AUTOHIDETIME);
m_rect.right = rcStart.right + ::MulDiv(rcDelta.right, dwTimeElapsed, wxABT_AUTOHIDETIME); rect.top = rcStart.top + ::MulDiv(rcDelta.top, dwTimeElapsed, wxABT_AUTOHIDETIME);
m_rect.bottom = rcStart.bottom + ::MulDiv(rcDelta.bottom, dwTimeElapsed, wxABT_AUTOHIDETIME); rect.right = rcStart.right + ::MulDiv(rcDelta.right, dwTimeElapsed, wxABT_AUTOHIDETIME);
rect.bottom = rcStart.bottom + ::MulDiv(rcDelta.bottom, dwTimeElapsed, wxABT_AUTOHIDETIME);
// Show the window at its changed position // Show the window at its changed position
::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE); wxVERIFY(::SetWindowPos(m_hWnd, NULL, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOZORDER | SWP_NOACTIVATE));
::UpdateWindow(m_hWnd); wxVERIFY(::UpdateWindow(m_hWnd));
} }
} }
} }
// Make sure that the window is at its final position
m_flags |= wxFLAG_POSITIONSET;
m_rect = rcEnd;
if (bShow) if (bShow)
m_flags &= ~wxFLAG_AUTOHIDDEN; m_flags &= ~wxFLAG_AUTOHIDDEN;
else else
m_flags |= wxFLAG_AUTOHIDDEN; m_flags |= wxFLAG_AUTOHIDDEN;
if (bVisible) { if (bVisible) {
::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE); wxVERIFY(::SetWindowPos(m_hWnd, NULL, rcEnd.left, rcEnd.top, rcEnd.right - rcEnd.left, rcEnd.bottom - rcEnd.top, SWP_NOZORDER | SWP_NOACTIVATE));
::UpdateWindow(m_hWnd); wxVERIFY(::UpdateWindow(m_hWnd));
// Reset auto-hide timer. // Reset auto-hide timer.
m_timerID = ::SetTimer(m_hWnd, wxABT_AUTOHIDETIMERID, wxABT_AUTOHIDETIMERINTERVAL, NULL); m_timerID = ::SetTimer(m_hWnd, wxABT_AUTOHIDETIMERID, wxABT_AUTOHIDETIMERINTERVAL, NULL);
} }
@ -505,40 +501,14 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
return lResult; return lResult;
} }
case WM_WINDOWPOSCHANGING: {
wxASSERT(lParam);
LPWINDOWPOS lpwndpos = (LPWINDOWPOS)lParam;
// Sync to our window rect.
if (!(m_flags & wxFLAG_POSITIONSET) && !(lpwndpos->flags & SWP_NOMOVE)) {
// Get the window position first time the SetWindowPos() is called.
m_rect.right = lpwndpos->x + m_rect.right - m_rect.left;
m_rect.bottom = lpwndpos->y + m_rect.bottom - m_rect.top;
m_rect.left = lpwndpos->x;
m_rect.top = lpwndpos->y;
m_flags |= wxFLAG_POSITIONSET;
} else {
lpwndpos->x = m_rect.left;
lpwndpos->y = m_rect.top;
}
lpwndpos->cx = m_rect.right - m_rect.left;
lpwndpos->cy = m_rect.bottom - m_rect.top;
lpwndpos->flags &= ~(SWP_NOMOVE | SWP_NOSIZE);
return wxFrame::MSWWindowProc(message, wParam, lParam);
}
case WM_WINDOWPOSCHANGED: { case WM_WINDOWPOSCHANGED: {
WXLRESULT lResult = wxFrame::MSWWindowProc(message, wParam, lParam); WXLRESULT lResult = wxFrame::MSWWindowProc(message, wParam, lParam);
if (IsDocked(m_state)) { if (IsDocked(m_state)) {
APPBARDATA abd = {
sizeof(abd),
m_hWnd
};
// When our window changes position, tell the Shell so that any // When our window changes position, tell the Shell so that any
// auto-hidden application bar on our edge stays on top of our window making it // auto-hidden application bar on our edge stays on top of our window making it
// always accessible to the user. // always accessible to the user.
APPBARDATA abd = { sizeof(abd), m_hWnd };
wxVERIFY(::SHAppBarMessage(ABM_WINDOWPOSCHANGED, &abd)); wxVERIFY(::SHAppBarMessage(ABM_WINDOWPOSCHANGED, &abd));
} }
@ -656,10 +626,6 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
wxFAIL; wxFAIL;
} }
// Set the window rect.
m_flags |= wxFLAG_POSITIONSET;
m_rect = *lpRect;
if (m_stateDesired != uStateDesiredPrev) { if (m_stateDesired != uStateDesiredPrev) {
// Notify about the proposed change of state, but don't change the state yet. // Notify about the proposed change of state, but don't change the state yet.
OnChangeState(m_stateDesired); OnChangeState(m_stateDesired);
@ -670,12 +636,8 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
case WM_SIZING: { case WM_SIZING: {
wxASSERT(lParam); wxASSERT(lParam);
LPRECT lpRect = (LPRECT)lParam; LPRECT lpRect = (LPRECT)lParam;
m_flags |= wxFLAG_POSITIONSET;
m_rect = *lpRect;
if (m_stateDesired == wxSTATE_FLOAT) { if (m_stateDesired == wxSTATE_FLOAT) {
// Remember the floating window size. // Remember the floating window size.
m_sizeFloat.cx = lpRect->right - lpRect->left; m_sizeFloat.cx = lpRect->right - lpRect->left;
@ -701,11 +663,13 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam; LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
// Convert client size to window size. // Convert client size to window size.
RECT rc = {}; RECT rectClient = {};
wxVERIFY(::GetClientRect(m_hWnd, &rc)); wxVERIFY(::GetClientRect(m_hWnd, &rectClient));
if (rc.right - rc.left && rc.bottom - rc.top) { if (rectClient.right - rectClient.left && rectClient.bottom - rectClient.top) {
lpMMI->ptMinTrackSize.x = m_sizeMin.cx + (m_rect.right - m_rect.left) - (rc.right - rc.left); RECT rectWindow = {};
lpMMI->ptMinTrackSize.y = m_sizeMin.cy + (m_rect.bottom - m_rect.top ) - (rc.bottom - rc.top ); wxVERIFY(::GetWindowRect(m_hWnd, &rectWindow));
lpMMI->ptMinTrackSize.x = m_sizeMin.cx + (rectWindow.right - rectWindow.left) - (rectClient.right - rectClient.left);
lpMMI->ptMinTrackSize.y = m_sizeMin.cy + (rectWindow.bottom - rectWindow.top ) - (rectClient.bottom - rectClient.top );
} }
return lResult; return lResult;
@ -761,14 +725,10 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
WXLRESULT lResult = wxFrame::MSWWindowProc(message, wParam, lParam); WXLRESULT lResult = wxFrame::MSWWindowProc(message, wParam, lParam);
if (IsDocked(m_state)) { if (IsDocked(m_state)) {
APPBARDATA abd = {
sizeof(abd),
m_hWnd
};
// When our window changes activation state, tell the Shell so that any // When our window changes activation state, tell the Shell so that any
// auto-hidden application bar on our edge stays on top of our window making it // auto-hidden application bar on our edge stays on top of our window making it
// always accessible to the user. // always accessible to the user.
APPBARDATA abd = { sizeof(abd), m_hWnd };
wxVERIFY(::SHAppBarMessage(ABM_ACTIVATE, &abd)); wxVERIFY(::SHAppBarMessage(ABM_ACTIVATE, &abd));
if (LOWORD(wParam) == WA_INACTIVE && IsAutoHide()) { if (LOWORD(wParam) == WA_INACTIVE && IsAutoHide()) {
@ -789,12 +749,14 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
// Get the position of the mouse and the application bar's position // Get the position of the mouse and the application bar's position
// Everything must be in screen coordinates. // Everything must be in screen coordinates.
DWORD dwPoint = ::GetMessagePos(); DWORD dwPoint = ::GetMessagePos();
wxPoint pt(GET_X_LPARAM(dwPoint), GET_Y_LPARAM(dwPoint)); wxPoint pointMouse(GET_X_LPARAM(dwPoint), GET_Y_LPARAM(dwPoint));
wxRect rc(m_rect.left, m_rect.top, m_rect.right - m_rect.left, m_rect.bottom - m_rect.top); RECT rect = {};
wxVERIFY(::GetWindowRect(m_hWnd, &rect));
wxRect rectBounds(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
// Add a little margin around the application bar // Add a little margin around the application bar
rc.Inflate(2 * ::GetSystemMetrics(SM_CXDOUBLECLK), 2 * ::GetSystemMetrics(SM_CYDOUBLECLK)); rectBounds.Inflate(2 * ::GetSystemMetrics(SM_CXDOUBLECLK), 2 * ::GetSystemMetrics(SM_CYDOUBLECLK));
if (!rc.Contains(pt)) { if (!rectBounds.Contains(pointMouse)) {
// If the mouse is NOT over or near the application bar, hide it. // If the mouse is NOT over or near the application bar, hide it.
ShowAutoHideAppBar(false); ShowAutoHideAppBar(false);
} }
@ -815,7 +777,7 @@ WXLRESULT wxAppBar::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
OnChangeTaskBarState(GetTaskBarState()); OnChangeTaskBarState(GetTaskBarState());
if (::IsWindowVisible(m_hWnd)) { if (::IsWindowVisible(m_hWnd)) {
// Set the Z-order. SWP_NOSENDCHANGING flag prevents our OnWindowPosChanging() method to be called, since moving is not desired. // Set the Z-order.
wxVERIFY(::SetWindowPos(m_hWnd, GetZWnd(m_state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOSENDCHANGING)); wxVERIFY(::SetWindowPos(m_hWnd, GetZWnd(m_state, m_flags), 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOSENDCHANGING));
} }
break; break;