From 8324b9ea0dc210909872eaa43d51bcc1f7c38746 Mon Sep 17 00:00:00 2001 From: Boopesh Mahendran Date: Fri, 22 Sep 2017 16:30:00 +0530 Subject: [PATCH 1/4] Version Bump to 1.12 --- appshell/mac/Info.plist | 4 ++-- appshell/version.rc | 4 ++-- appshell/version_linux.h | 2 +- installer/mac/buildInstaller.sh | 2 +- installer/win/brackets-win-install-build.xml | 2 +- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appshell/mac/Info.plist b/appshell/mac/Info.plist index ed814ba25..88199905f 100644 --- a/appshell/mac/Info.plist +++ b/appshell/mac/Info.plist @@ -19,9 +19,9 @@ CFBundleSignature ???? CFBundleVersion - 1.11.0 + 1.12.0 CFBundleShortVersionString - 1.11.0 + 1.12.0 NSMainNibFile MainMenu NSPrincipalClass diff --git a/appshell/version.rc b/appshell/version.rc index 5fedc3191..a8ae8b0f9 100644 --- a/appshell/version.rc +++ b/appshell/version.rc @@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,11,0,0 +FILEVERSION 1,12,0,0 /* PRODUCTVERSION 1,0,0,0 */ FILEOS VOS__WINDOWS32 FILETYPE VFT_APP @@ -42,7 +42,7 @@ BEGIN BEGIN VALUE "CompanyName", "brackets.io\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "Release 1.11.0\0" + VALUE "FileVersion", "Release 1.12.0\0" VALUE "ProductName", APP_NAME "\0" VALUE "ProductVersion", "\0" VALUE "LegalCopyright", "(c) 2012 Adobe Systems, Inc.\0" diff --git a/appshell/version_linux.h b/appshell/version_linux.h index 970a8408a..56d908c87 100644 --- a/appshell/version_linux.h +++ b/appshell/version_linux.h @@ -1 +1 @@ -#define APP_VERSION "1.11.0.0" +#define APP_VERSION "1.12.0.0" diff --git a/installer/mac/buildInstaller.sh b/installer/mac/buildInstaller.sh index 07f1bcefa..e3bc6597d 100755 --- a/installer/mac/buildInstaller.sh +++ b/installer/mac/buildInstaller.sh @@ -2,7 +2,7 @@ # config releaseName="Brackets" -version="1.11" +version="1.12" dmgName="${releaseName} Release ${version}" format="bzip2" encryption="none" diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml index 613b8d381..9216c3267 100644 --- a/installer/win/brackets-win-install-build.xml +++ b/installer/win/brackets-win-install-build.xml @@ -12,7 +12,7 @@ default="build.mul"> - + diff --git a/package.json b/package.json index 7ec5d0e45..671a22d66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Brackets-Shell", - "version": "1.11.0-0", + "version": "1.12.0-0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets-shell/issues" From 1e5d70246636b54427ce35eb6b72e909707a0031 Mon Sep 17 00:00:00 2001 From: Prashanth Nethi Date: Thu, 7 Dec 2017 15:04:54 +0530 Subject: [PATCH 2/4] Update Gruntfile.js Changes for custom Linux CEF patch --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8758a8f1e..110876c1d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,7 +38,7 @@ module.exports = function (grunt) { } if (platform === "linux") { - cef_version = "3.2704.1414"; + cef_version = "3.2704.1434"; } grunt.initConfig({ @@ -333,4 +333,4 @@ module.exports = function (grunt) { grunt.loadNpmTasks("grunt-curl"); grunt.registerTask("default", ["setup", "build"]); -}; \ No newline at end of file +}; From 908ed1503995c1b5ae013473c4b181a9aa64fd22 Mon Sep 17 00:00:00 2001 From: Prashanth Nethi Date: Thu, 7 Dec 2017 16:21:08 +0530 Subject: [PATCH 3/4] Revert "Update Gruntfile.js" This reverts commit 1e5d70246636b54427ce35eb6b72e909707a0031. --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 110876c1d..8758a8f1e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,7 +38,7 @@ module.exports = function (grunt) { } if (platform === "linux") { - cef_version = "3.2704.1434"; + cef_version = "3.2704.1414"; } grunt.initConfig({ @@ -333,4 +333,4 @@ module.exports = function (grunt) { grunt.loadNpmTasks("grunt-curl"); grunt.registerTask("default", ["setup", "build"]); -}; +}; \ No newline at end of file From 615371466d3d56a5c5f3cfc3e831297044300811 Mon Sep 17 00:00:00 2001 From: Prashanth Nethi Date: Wed, 20 Dec 2017 02:32:21 -0500 Subject: [PATCH 4/4] [Linux only] CEF Upgrade to 2785 (#626) * Force HiDPI to scale factor 1.0 for now on Linux * Linux only: Changes required for CEF 2785 Integration * 1) Removed force-device-scale-factor code\n 2) Introduced Delayed resize to repaginate view port content 3) Change the minor version of CEF to 1486 * Removing unused variable. * Address review comments. * Reverting the space change. --- Gruntfile.js | 2 +- appshell/appshell_extensions.js | 5 ++++- appshell/browser/root_window_gtk.cc | 33 +++++++++++++++++++++++++++++ appshell/client_handler.cpp | 6 +++++- appshell/client_handler.h | 6 +++++- 5 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8758a8f1e..3335e0664 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,7 +38,7 @@ module.exports = function (grunt) { } if (platform === "linux") { - cef_version = "3.2704.1414"; + cef_version = "3.2785.1486"; } grunt.initConfig({ diff --git a/appshell/appshell_extensions.js b/appshell/appshell_extensions.js index 91a945444..ebfbf6155 100644 --- a/appshell/appshell_extensions.js +++ b/appshell/appshell_extensions.js @@ -942,5 +942,8 @@ if (!appshell.app) { // Alias the appshell object to brackets. This is temporary and should be removed. - brackets = appshell; + // The following is now moved to Global.js as newer versions of CEF crash upon + // eval of this statement. + //brackets = appshell; + })(); diff --git a/appshell/browser/root_window_gtk.cc b/appshell/browser/root_window_gtk.cc index b22c63509..d566bbdd3 100644 --- a/appshell/browser/root_window_gtk.cc +++ b/appshell/browser/root_window_gtk.cc @@ -360,6 +360,36 @@ void RootWindowGtk::CreateRootWindow(const CefBrowserSettings& settings) { } } +// The following function makes sure we repaginate +// the content once the window is shown first. The +// problem was that the view port was not getting +// updated and a fake resize was required for the +// content to repaginate. +void DelayedResize(GtkWidget* window_) { + if(window_){ + GtkWindow* window = GTK_WINDOW(window_); + GdkWindow* gdk_window = gtk_widget_get_window(window_); + + gint x; + gint y; + gint width; + gint height; + gint depth; + + gdk_window_get_geometry (gdk_window, + &x, + &y, + &width, + &height, + &depth); + + // A hack to repaginate the content inside the window. + // Nudge the width and height by one pixel, so that the + // resize is not noticeable. + gdk_window_resize (gdk_window, width + 1, height + 1); + } +} + void RootWindowGtk::OnBrowserCreated(CefRefPtr browser) { REQUIRE_MAIN_THREAD(); @@ -367,6 +397,9 @@ void RootWindowGtk::OnBrowserCreated(CefRefPtr browser) { // created. if (is_popup_) CreateRootWindow(CefBrowserSettings()); + + // Post a message to CEF queue for delated resize. + CefPostTask(TID_UI, base::Bind(&DelayedResize, window_)); } void RootWindowGtk::OnBrowserWindowDestroyed() { diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp index 18698d2f6..9add38a83 100644 --- a/appshell/client_handler.cpp +++ b/appshell/client_handler.cpp @@ -202,7 +202,11 @@ bool ClientHandler::OnDragEnter(CefRefPtr browser, } void ClientHandler::OnLoadStart(CefRefPtr browser, - CefRefPtr frame) { + CefRefPtr frame + #ifdef OS_LINUX + ,TransitionType transition_type + #endif + ) { CEF_REQUIRE_UI_THREAD(); if (m_BrowserId == browser->GetIdentifier() && frame->IsMain()) { diff --git a/appshell/client_handler.h b/appshell/client_handler.h index ed6ade301..b9a516c99 100644 --- a/appshell/client_handler.h +++ b/appshell/client_handler.h @@ -126,7 +126,11 @@ virtual bool OnBeforePopup(CefRefPtr browser, // CefLoadHandler methods virtual void OnLoadStart(CefRefPtr browser, - CefRefPtr frame) OVERRIDE; + CefRefPtr frame + #ifdef OS_LINUX + ,TransitionType transition_type + #endif + ) OVERRIDE; virtual void OnLoadEnd(CefRefPtr browser, CefRefPtr frame, int httpStatusCode) OVERRIDE;