From 3c89d60ccbe3b04cd3145c568727db3ab3fcc027 Mon Sep 17 00:00:00 2001 From: legonigel Date: Fri, 20 Mar 2015 03:12:50 -0400 Subject: [PATCH 1/3] Fix #4349 Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych. --- src/lib/platform/MSWindowsDesks.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index cfbcd0c9..b46230b3 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -435,8 +435,7 @@ MSWindowsDesks::destroyClass(ATOM windowClass) const HWND MSWindowsDesks::createWindow(ATOM windowClass, const char* name) const { - HWND window = CreateWindowEx(WS_EX_TOPMOST | - WS_EX_TRANSPARENT | + HWND window = CreateWindowEx(WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW, reinterpret_cast(windowClass), name, @@ -596,7 +595,7 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout) w = m_w; h = m_h; } - SetWindowPos(desk->m_window, HWND_TOPMOST, x, y, w, h, + SetWindowPos(desk->m_window, HWND_TOP, x, y, w, h, SWP_NOACTIVATE | SWP_SHOWWINDOW); // if not using low-level hooks we have to also activate the @@ -635,7 +634,7 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout) } else { // move hider window under the cursor center, raise, and show it - SetWindowPos(desk->m_window, HWND_TOPMOST, + SetWindowPos(desk->m_window, HWND_TOP, m_xCenter, m_yCenter, 1, 1, SWP_NOACTIVATE | SWP_SHOWWINDOW); From acb4442259108a4e2cc6c5fcbf5f971f301dff74 Mon Sep 17 00:00:00 2001 From: XinyuHou Date: Fri, 20 Mar 2015 12:18:49 +0000 Subject: [PATCH 2/3] Version to 1.6.3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3e587b7..a7b32279 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # Version number for Synergy set(VERSION_MAJOR 1) set(VERSION_MINOR 6) -set(VERSION_REV 2) +set(VERSION_REV 3) set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}") cmake_minimum_required(VERSION 2.6) From 486bea0d02ae03f5efdbffa2467fe0520dee5d3e Mon Sep 17 00:00:00 2001 From: XinyuHou Date: Fri, 20 Mar 2015 12:22:56 +0000 Subject: [PATCH 3/3] Resolve #4455 replaced version with branch name --- ext/toolchain/commands1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index d0b0960a..3dcfb1c1 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1510,8 +1510,8 @@ class InternalCommands: def dist_name_rev(self, type): # find the version number (we're puting the rev in after this) - pattern = '(.*\d+\.\d+\.\d+)(.*)' - replace = "\g<1>-%s-%s\g<2>" % ( + pattern = '(\d+\.\d+\.\d+)' + replace = "%s-%s" % ( self.getGitBranchName(), self.getGitRevision()) return re.sub(pattern, replace, self.dist_name(type))