Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EXPLORER]

Browse source 
* Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis.
* In Windows, fixes the taskbar having a size grip with the taskbar is themed and locked.
* In ReactOS, the size grip never seems to disappear, contrary to Giannis' concerns in the issue.
* Because of the above, I decided to commit the changes, and let the sizing edge inconsistency be a followup to the issue.
CORE-6966 #resolve #comment A modified version of the patch was commited in r65804. Thanks.

svn path=/trunk/; revision=65804
This commit is contained in:
David Quintana 2014-12-23 01:31:36 +00:00
parent d9a214e353
commit b11d90c85f
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/base/shell/explorer/traywnd.cpp
View file

@ -1435,7 +1435,7 @@ ChangePos:
else
m_Theme = NULL;
if (m_Theme)
if (Locked && m_Theme)
{
SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);
}
@ -1443,6 +1443,7 @@ ChangePos:
{
SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER);
}
SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
return TRUE;
}
@ -1787,9 +1788,8 @@ ChangePos:
BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock)
{
BOOL bPrevLock;
BOOL bPrevLock = Locked;
bPrevLock = Locked;
if (Locked != bLock)
{
Locked = bLock;
@ -1800,8 +1800,20 @@ ChangePos:
{
/* Reset?? */
Locked = bPrevLock;
return bPrevLock;
}
}
if (Locked && m_Theme)
{
SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);
}
else
{
SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER);
}
SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
}
return bPrevLock;