FZ: do not activate zones window when it's shown (#8795)

This commit is contained in:
Andrey Nekrasov 2020-12-29 16:38:19 +03:00 committed by GitHub
parent 9b2f1a826d
commit 4f594c92e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 37 deletions

View File

@ -218,7 +218,6 @@ CDeclaration
cdpx cdpx
cdpxwin cdpxwin
CENTERALIGN CENTERALIGN
Cfg
cfg cfg
changecursor changecursor
Changemove Changemove
@ -276,8 +275,8 @@ coclass
codebase codebase
codecvt codecvt
codeofconduct codeofconduct
codereview
codeql codeql
codereview
COINIT COINIT
Colorbrush Colorbrush
colorconv colorconv
@ -330,13 +329,11 @@ countslabelrenamingfmt
countslabelselectedfmt countslabelselectedfmt
cout cout
CPlus CPlus
cplusplus
CPower CPower
cpp cpp
CPPARM CPPARM
cppblog cppblog
cppm cppm
cpprestsdk
cppruntime cppruntime
cppstd cppstd
cppwinrt cppwinrt
@ -651,14 +648,11 @@ ENU
enum enum
ENUMITEMS ENUMITEMS
EOAC EOAC
EOL
eol eol
epicgames epicgames
eport
ERASEBKGND ERASEBKGND
EREOF EREOF
EResize EResize
ERRORLEVEL
errorlevel errorlevel
ERRORMESSAGE ERRORMESSAGE
ERRORTITLE ERRORTITLE
@ -1076,7 +1070,6 @@ ISavable
isbi isbi
ISearch ISearch
IService IService
ISetting
isetting isetting
isfinite isfinite
IShell IShell
@ -1154,7 +1147,6 @@ keyremaps
keystokes keystokes
Keystool Keystool
Keytool Keytool
KEYUP
keyup keyup
Kf Kf
KILLFOCUS KILLFOCUS
@ -1224,7 +1216,6 @@ LOGPIXELSX
LOn LOn
lookbehind lookbehind
lowlevel lowlevel
lowlevelkb
LOWORD LOWORD
lparam lparam
LPBYTE LPBYTE
@ -1300,7 +1291,6 @@ MBUTTON
MBUTTONDBLCLK MBUTTONDBLCLK
MBUTTONDOWN MBUTTONDOWN
MBUTTONUP MBUTTONUP
mday
Mdb Mdb
MDICHILD MDICHILD
MDL MDL
@ -1343,8 +1333,8 @@ modulekey
MONITORINFO MONITORINFO
MONITORINFOEX MONITORINFOEX
MONITORINFOEXW MONITORINFOEXW
monitorinfof
MONITORINFOF MONITORINFOF
monitorinfof
Monthand Monthand
Moq Moq
MOUSEACTIVATE MOUSEACTIVATE
@ -1399,7 +1389,6 @@ multizone
mutex mutex
mutexes mutexes
muxc muxc
Mvvm
mvvm mvvm
MYICON MYICON
myuri myuri
@ -1698,7 +1687,6 @@ propkey
propvarutil propvarutil
Prt Prt
prui prui
PRVPANE
prvpane prvpane
psapi psapi
PSECURITY PSECURITY
@ -1747,7 +1735,6 @@ RAII
RAlt RAlt
randyrants randyrants
RAWPATH RAWPATH
rawtime
rbegin rbegin
Rbp Rbp
RBUTTON RBUTTON
@ -1793,7 +1780,6 @@ RENAMEONCOLLISION
Renamer Renamer
Reparse Reparse
REPLACEWITH REPLACEWITH
reportd
Reportx Reportx
requery requery
requerying requerying
@ -1896,7 +1882,6 @@ serializer
serizalization serizalization
serverside serverside
SETCONTEXT SETCONTEXT
SETCURSOR
setcursor setcursor
SETFOCUS SETFOCUS
SETFOREGROUND SETFOREGROUND
@ -1928,7 +1913,6 @@ SHELLDLL
shellex shellex
SHELLEXECUTEINFO SHELLEXECUTEINFO
SHELLEXECUTEINFOW SHELLEXECUTEINFOW
Shellscalingapi
shellscalingapi shellscalingapi
Shelveset Shelveset
SHFILEINFO SHFILEINFO
@ -1948,12 +1932,12 @@ SHORTCUTSTARTWITHMODIFIER
Shortcuttool Shortcuttool
shortdate shortdate
SHORTPATH SHORTPATH
should've
showcolorname showcolorname
SHOWDEFAULT SHOWDEFAULT
SHOWELEVATIONPROMPT SHOWELEVATIONPROMPT
SHOWMAXIMIZED SHOWMAXIMIZED
SHOWMINIMIZED SHOWMINIMIZED
SHOWNA
SHOWNORMAL SHOWNORMAL
showwindow showwindow
shtypes shtypes
@ -1980,7 +1964,6 @@ SIZENWSE
sizeof sizeof
SIZEWE SIZEWE
sketchapp sketchapp
SKIPDOTNETINSTALL
SKIPOWNPROCESS SKIPOWNPROCESS
sku sku
SKYBLUE SKYBLUE
@ -2047,7 +2030,6 @@ stdin
stdlib stdlib
STDMETHODCALLTYPE STDMETHODCALLTYPE
STDMETHODIMP STDMETHODIMP
Stdout
stdout stdout
STEPIT STEPIT
stgm stgm
@ -2067,7 +2049,6 @@ stringtable
stringval stringval
strsafe strsafe
strutil strutil
STTNGS
sttngs sttngs
Stubless Stubless
STYLECHANGED STYLECHANGED
@ -2106,7 +2087,6 @@ SYSDEADCHAR
SYSICONINDEX SYSICONINDEX
SYSKEY SYSKEY
syskeydown syskeydown
SYSKEYUP
syskeyup syskeyup
syslog syslog
SYSMENU SYSMENU
@ -2164,7 +2144,6 @@ THISCOMPONENT
thre thre
tif tif
TILEDWINDOW TILEDWINDOW
timeinfo
Timeline Timeline
timeunion timeunion
timeutil timeutil
@ -2182,8 +2161,8 @@ toggleright
toggleswitch toggleswitch
toolbar toolbar
Toolchain Toolchain
toolset
Toolset Toolset
toolset
tooltip tooltip
toolwindow toolwindow
TOPDOWNDIB TOPDOWNDIB
@ -2347,7 +2326,6 @@ VSTT
VTABLE VTABLE
Vtbl Vtbl
Vx Vx
walkthrough
watsonportal watsonportal
wav wav
WBounds WBounds
@ -2365,12 +2343,11 @@ wcslen
wcsncmp wcsncmp
wcsnicmp wcsnicmp
wdp wdp
WDS
wds wds
wdupenv wdupenv
weakme weakme
webapp webapp
webcam Webcam
webclient webclient
webkit webkit
webp webp
@ -2388,7 +2365,6 @@ wiki
wikipedia wikipedia
wil wil
wildcards wildcards
WINAPI
winapi winapi
winauto winauto
wincolor wincolor
@ -2435,7 +2411,6 @@ wixtoolset
WIXUI WIXUI
WKSG WKSG
wmain wmain
wmi
WMKEYDOWN WMKEYDOWN
WMKEYUP WMKEYUP
wmonk wmonk
@ -2450,11 +2425,9 @@ WNDPROC
woff woff
wofstream wofstream
wordpad wordpad
wordpress
workaround workaround
workflow workflow
wostream wostream
wostringstream
wox wox
wparam wparam
wpf wpf
@ -2511,7 +2484,6 @@ XStr
XToolset XToolset
xunit xunit
XY XY
YAML
yaml yaml
YAngle YAngle
YDiff YDiff

View File

@ -702,9 +702,7 @@ void FancyZones::ToggleEditor() noexcept
if (showDpiWarning) if (showDpiWarning)
{ {
// We must show the message box in a separate thread, since this code is called from a low-level // We must show the message box in a separate thread, since this code is called from a low-level
// keyboard hook callback, and launching messageboxes from it has unexpected side effects, // keyboard hook callback, and launching messageboxes from it has unexpected side effects
// like triggering EVENT_SYSTEM_MOVESIZEEND prematurely.
// TODO: understand the root cause of this, until then it's commented out.
//std::thread{ [] { //std::thread{ [] {
// MessageBoxW(nullptr, // MessageBoxW(nullptr,
// GET_RESOURCE_STRING(IDS_SPAN_ACROSS_ZONES_WARNING).c_str(), // GET_RESOURCE_STRING(IDS_SPAN_ACROSS_ZONES_WARNING).c_str(),

View File

@ -218,7 +218,7 @@ void ZoneWindowDrawing::Show(unsigned animationMillis)
if (!m_animation) if (!m_animation)
{ {
ShowWindow(m_window, SW_SHOWDEFAULT); ShowWindow(m_window, SW_SHOWNA);
if (animationMillis > 0) if (animationMillis > 0)
{ {
m_animation.emplace(AnimationInfo{ std::chrono::steady_clock().now(), animationMillis }); m_animation.emplace(AnimationInfo{ std::chrono::steady_clock().now(), animationMillis });