commit 7d72590c2bac2567d176b6c11c6ac6abd39de811 Author: Georg Koppen <gk@torproject.org> Date: Tue Sep 18 09:45:03 2018 +0000 Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 --- projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 2 ++ projects/tor-browser/gtk3-settings.ini | 2 ++ 3 files changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 219f622..4d51ec6 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -70,6 +70,10 @@ tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input [% INCLUDE 'RelativeLink/start-tor-browser' -%] RBM_TB_EOF chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser + # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. + GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 + mkdir -p $GTK_SETTINGS_DIR + cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e0581f4..1647b77 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,6 +74,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' + - filename: 'gtk3-settings.ini' + enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' diff --git a/projects/tor-browser/gtk3-settings.ini b/projects/tor-browser/gtk3-settings.ini new file mode 100644 index 0000000..55c8e89 --- /dev/null +++ b/projects/tor-browser/gtk3-settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-primary-button-warps-slider = false