Merge lp://qastaging/~thumper/unity/fix-lens-scroll-bars into lp://qastaging/unity
Proposed by
Tim Penhey
| Status: | Merged |
|---|---|
| Merged at revision: | 1683 |
| Proposed branch: | lp://qastaging/~thumper/unity/fix-lens-scroll-bars |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
189 lines (+28/-45) 4 files modified
plugins/unityshell/src/HomeView.cpp (+10/-17) plugins/unityshell/src/LensView.cpp (+11/-22) plugins/unityshell/src/LensView.h (+5/-5) plugins/unityshell/src/SwitcherController.cpp (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~thumper/unity/fix-lens-scroll-bars |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
There was some screwyness here with two definitions
for LensScrollView. I really would have expected the linker
to blow chunks, but it didn't.
I changed this so the one used in HomeView.cpp is called
HomeScrollView.
I simplified the classes so they don't change the visibility
of the SetVScrollBar function, but instead use it in the
constructor.
The delete calls of the scroll bars in LensView.cpp was causing
explosions.
The switcher controller also caused problems on shutdown on the
one time I didn't hit alt-tab.
To post a comment you must log in.
Revision history for this message
| Jason Smith (jassmith) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
