Merge lp:~aacid/overlay-scrollbar/qt_no_overlay_scrollbar into lp:overlay-scrollbar

[Albert Astals Cid]

Use ubuntu_gtk_set_use_overlay_scrollbar and ubuntu_gtk_get_use_overlay_scrollbar so that other programs can say they don't want to use the overlay scrollbars

Use ubuntu_gtk_set_use_overlay_scrollbar and ubuntu_gtk_get_use_overlay_scrollbar so that other programs can say they don't want to use the overlay scrollbars

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./distribution=quantal,flavor=amd64/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./distribution=quantal,flavor=i386/3/console

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

The branch relies on a patch on both gtk2 and qt sides which was supposed to be removed. It is also not fixing the bug on static binaries without the ubuntu qt or gtk libraries.

Thus, this looks more like a possible distropatch than being part of the real code.

At this time, we wait to see if we come up with a clean fix, that does not use external API which we were going to remove.

If we run out of ideas, this is part of the list of workarounds we can add as distropatches.

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./build=pbuilder,distribution=quantal,flavor=amd64/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./build=pbuilder,distribution=quantal,flavor=i386/7/console

review: Needs Fixing (continuous-integration)

Unmerged revisions

357. By Albert Astals Cid on 2012-09-17

Use ubuntu_gtk_set_use_overlay_scrollbar and ubuntu_gtk_get_use_overlay_scrollbar so that other programs can say they don't want to use the overlay scrollbars

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-08-29 16:09:23 +0000
+++ os/os-scrollbar.c	2012-09-17 14:07:20 +0000
@@ -3161,7 +3161,11 @@
 static gboolean
 use_overlay_scrollbar (void)
 {
+#ifdef USE_GTK3
   return scrollbar_mode != SCROLLBAR_MODE_NORMAL;
+#else
+  return scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar ();
+#endif
 }
 
 static void
@@ -4231,6 +4235,10 @@
                                    "}\n", -1, NULL);
 #endif
 
+#ifndef USE_GTK3
+  ubuntu_gtk_set_use_overlay_scrollbar (TRUE);
+#endif
+
   /* Load custom overlay scrollbar style. */
   if (use_overlay_scrollbar ())
     custom_style_load ();