diff options
| author | Gord Allott <gord.allott@canonical.com> | 2010-01-07 12:50:57 +0000 |
|---|---|---|
| committer | Gord Allott <gord.allott@canonical.com> | 2010-01-07 12:50:57 +0000 |
| commit | bc14167fd512124f869f1e0f9d79b97a5c91ce71 (patch) | |
| tree | ac5a8998fe04799bc33aff9103392b4d1a9481f0 /src | |
| parent | 882624f7a2980bc0898c7aace02e4816c5069f48 (diff) | |
added clip to the scroller background
(bzr r50.2.2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/quicklauncher/unity-scroller.vala | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9429f4414..e4c9c3504 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = - +BUILT_SOURCES = +CLEANFILES = +EXTRA_DIST = + DATADIR = $(datadir) if HAVE_TESTING BASE_CFLAGS+=-DTESTING @@ -13,12 +13,12 @@ else PKGDATADIR=$(datadir)/unity endif noinst_LTLIBRARIES = \ - libunity-static.la + libunity-static.la bin_PROGRAMS = \ unity -# unity static lib +# unity static lib libunity_static_la_CPPFLAGS = \ -DDATADIR=\"$(DATADIR)\" \ -DPKGDATADIR=\"$(PKGDATADIR)\" \ @@ -39,6 +39,7 @@ libunity_static_la_VALAFLAGS = \ --pkg clutk-0.3 \ --pkg clutter-1.0 \ --pkg clutter-gtk-0.10 \ + --pkg cogl-1.0 \ --pkg gconf-2.0 \ --pkg gdk-2.0 \ --pkg gee-1.0 \ @@ -117,6 +118,7 @@ unity_VALAFLAGS = \ --pkg clutk-0.3 \ --pkg clutter-1.0 \ --pkg clutter-gtk-0.10 \ + --pkg cogl-1.0 \ --pkg gtk+-2.0 \ --pkg gdk-2.0 \ --pkg gee-1.0 \ diff --git a/src/quicklauncher/unity-scroller.vala b/src/quicklauncher/unity-scroller.vala index 6f8310953..08e88e016 100644 --- a/src/quicklauncher/unity-scroller.vala +++ b/src/quicklauncher/unity-scroller.vala @@ -577,6 +577,8 @@ namespace Unity.Widgets child_box.x1 = box.x1; child_box.x2 = box.x2; bgtex.allocate (child_box, flags); + bgtex.set_clip (box.x1, drag_pos + box.get_height () * 2, + box.get_width (), box.get_height ()); gradient.width = box.get_width(); gradient.allocate (box, flags); @@ -622,6 +624,7 @@ namespace Unity.Widgets public void add (Clutter.Actor actor) { + this.add_actor (actor); } public void add_actor (Clutter.Actor actor) @@ -650,8 +653,9 @@ namespace Unity.Widgets public void remove (Clutter.Actor actor) { - + this.remove_actor (actor); } + public void remove_actor (Clutter.Actor actor) { ScrollerChild found_container = null; |