overlay-scrollbar

Merge lp:~larsu/overlay-scrollbar/hide-scrollbars-before-unmapping into lp:overlay-scrollbar

  1. hide-scrollbars-before-unmapping
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 384
Merged at revision: 383
Proposed branch: lp:~larsu/overlay-scrollbar/hide-scrollbars-before-unmapping
Merge into: lp:overlay-scrollbar
Diff against target: 23 lines (+5/-2)
1 file modified
os/os-scrollbar.c (+5/-2)
To merge this branch: bzr merge lp:~larsu/overlay-scrollbar/hide-scrollbars-before-unmapping
Reviewer Review Type Date Requested Status
Andrea Cimitan Approve
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+197415@code.launchpad.net

Commit message

Hide scrollbars before unmapping them

Otherwise gtk_widget_pop_verify_invariants throws a warning about unrealizing a visible widget.

Description of the change

Hide scrollbars before unmapping them

Otherwise gtk_widget_pop_verify_invariants throws a warning about unrealizing a visible widget.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:383
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

great, no warning since the update and no visible side effect

review: Approve
lp:~larsu/overlay-scrollbar/hide-scrollbars-before-unmapping updated
384. By Lars Karlitski

Remove redundant call to gtk_widget_map()

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:384
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-trusty-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/13/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve

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 2013-11-29 13:52:21 +0000
3+++ os/os-scrollbar.c 2013-12-12 10:17:58 +0000
4@@ -4232,7 +4232,10 @@
5 /* The following unrealize will unmap the widget:
6 * create a list of mapped scrollbars to remap them afterwards. */
7 if (gtk_widget_get_mapped (widget))
8- *mapped_list = g_slist_prepend (*mapped_list, widget);
9+ {
10+ *mapped_list = g_slist_prepend (*mapped_list, widget);
11+ gtk_widget_hide (widget);
12+ }
13
14 gtk_widget_unrealize (widget);
15 }
16@@ -4256,7 +4259,7 @@
17
18 /* Remap the list of scrollbars that were unmapped by the unload gfunc.
19 * Request a resize to update widget allocation. */
20- gtk_widget_map (widget);
21+ gtk_widget_show (widget);
22 gtk_widget_queue_resize (widget);
23 }
24

Subscribers

People subscribed via source and target branches