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

Proposed by Albert Astals Cid on 2012-09-17
Status: Rejected
Rejected by: Albert Astals Cid on 2013-11-29
Proposed branch: lp:~aacid/overlay-scrollbar/qt_no_overlay_scrollbar
Merge into: lp:overlay-scrollbar
Diff against target: 26 lines (+8/-0)
1 file modified
os/os-scrollbar.c (+8/-0)
To merge this branch: bzr merge lp:~aacid/overlay-scrollbar/qt_no_overlay_scrollbar
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-10-15
Andrea Cimitan 2012-09-17 Disapprove on 2012-09-18
jenkins (community) continuous-integration Approve on 2012-09-17
Review via email: mp+124697@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Andrea Cimitan (cimi) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2012-08-29 16:09:23 +0000
3+++ os/os-scrollbar.c 2012-09-17 14:07:20 +0000
4@@ -3161,7 +3161,11 @@
5 static gboolean
6 use_overlay_scrollbar (void)
7 {
8+#ifdef USE_GTK3
9 return scrollbar_mode != SCROLLBAR_MODE_NORMAL;
10+#else
11+ return scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar ();
12+#endif
13 }
14
15 static void
16@@ -4231,6 +4235,10 @@
17 "}\n", -1, NULL);
18 #endif
19
20+#ifndef USE_GTK3
21+ ubuntu_gtk_set_use_overlay_scrollbar (TRUE);
22+#endif
23+
24 /* Load custom overlay scrollbar style. */
25 if (use_overlay_scrollbar ())
26 custom_style_load ();

Subscribers

People subscribed via source and target branches