[meego-commits] 24728: Changes to MeeGo:1.2.0:oss:Update:Testing/meego-panel-web
lionel
no_reply at build.meego.com
Mon Jan 9 14:52:45 UTC 2012
Hi,
I have made the following changes to meego-panel-web in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.
Thank You,
lionel
[This message was auto-generated]
---
Request #24728:
submit: home:lionel:branches:MeeGo:1.2.0:oss:Update:Testing/meego-panel-web(r5)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/meego-panel-web
Message:
* Mon Jan 9 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.2
- Fix non rendered items in scrollview (BMC#24550)
State: new 2012-01-09T06:28:43 lionel
Comment: None
changes files:
--------------
--- meego-panel-web.changes
+++ meego-panel-web.changes
@@ -0,0 +1,3 @@
+* Mon Jan 9 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.2
+- Fix non rendered items in scrollview (BMC#24550)
+
new:
----
0001-fix-non-painted-items-in-scrollviews.patch
spec files:
-----------
--- meego-panel-web.spec
+++ meego-panel-web.spec
@@ -18,6 +18,7 @@
Patch0: netpanel-ensure-tile-s-title-is-contained-within-the.patch
Patch1: 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
Patch2: i18n.patch
+Patch3: 0001-fix-non-painted-items-in-scrollviews.patch
Requires: mutter-netbook
BuildRequires: pkgconfig(clutter-x11-1.0)
BuildRequires: pkgconfig(gdk-x11-2.0)
@@ -45,6 +46,8 @@
%patch1 -p1
# i18n.patch
%patch2 -p1
+# 0001-fix-non-painted-items-in-scrollviews.patch
+%patch3 -p1
# >> setup
# << setup
@@ -52,7 +55,8 @@
# >> build pre
# << build pre
-%autogen --disable-static
+%autogen --disable-static \
+
%configure --disable-static
make %{?jobs:-j%jobs}
other changes:
--------------
++++++ 0001-fix-non-painted-items-in-scrollviews.patch (new)
--- 0001-fix-non-painted-items-in-scrollviews.patch
+++ 0001-fix-non-painted-items-in-scrollviews.patch
+From 62adf46ff9ed1a3c87b557785d48ed2a5f334890 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin at gmail.com>
+Date: Mon, 9 Jan 2012 14:34:02 +0000
+Subject: [PATCH] fix non painted items in scrollviews
+
+---
+ data/netpanel/panel.css | 2 +-
+ netpanel/Makefile.am | 4 +-
+ netpanel/meego-netbook-netpanel.cc | 176 ++++++++------
+ netpanel/mnb-netpanel-scrollview.cc | 460 -----------------------------------
+ netpanel/mnb-netpanel-scrollview.h | 75 ------
+ 5 files changed, 100 insertions(+), 617 deletions(-)
+ delete mode 100644 netpanel/mnb-netpanel-scrollview.cc
+ delete mode 100644 netpanel/mnb-netpanel-scrollview.h
+
+diff --git a/data/netpanel/panel.css b/data/netpanel/panel.css
+index 5049e35..11bada3 100644
+--- a/data/netpanel/panel.css
++++ b/data/netpanel/panel.css
+@@ -118,7 +118,7 @@ MeegoNetbookNetpanel *#netpanel-entrytable
+ padding: 0 7;
+ }
+
+-MnbNetpanelScrollview
++MxScrollview
+ {
+ padding: 0 14;
+ }
+diff --git a/netpanel/Makefile.am b/netpanel/Makefile.am
+index 289df4d..488ceb5 100644
+--- a/netpanel/Makefile.am
++++ b/netpanel/Makefile.am
+@@ -25,9 +25,7 @@ meego_panel_web_SOURCES = \
+ meego-netbook-netpanel.cc \
+ meego-netbook-netpanel.h \
+ mnb-netpanel-bar.cc \
+- mnb-netpanel-bar.h \
+- mnb-netpanel-scrollview.cc \
+- mnb-netpanel-scrollview.h
++ mnb-netpanel-bar.h
+
+ meego_panel_web_DEPENDENCIES = \
+ $(top_builddir)/common/libcommon.a
+diff --git a/netpanel/meego-netbook-netpanel.cc b/netpanel/meego-netbook-netpanel.cc
+index d1fcfa3..797b132 100644
+--- a/netpanel/meego-netbook-netpanel.cc
++++ b/netpanel/meego-netbook-netpanel.cc
+@@ -36,7 +36,6 @@ extern "C" {
+ #include <meego-panel/mpl-panel-client.h>
+ #include "meego-netbook-netpanel.h"
+ #include "mnb-netpanel-bar.h"
+-#include "mnb-netpanel-scrollview.h"
+ #include "mwb-utils.h"
+ }
+
+@@ -82,9 +81,11 @@ struct _MeegoNetbookNetpanelPrivate
+ MxWidget *entry;
+
+ MxWidget *tabs_label;
+- MxWidget *tabs_view;
++ ClutterActor *tabs_scrollview;
++ ClutterActor *tabs_box;
+ MxWidget *favs_label;
+- MxWidget *favs_view;
++ ClutterActor *favs_scrollview;
++ ClutterActor *favs_box;
+
+ guint n_tabs;
+ guint n_favs;
+@@ -140,32 +141,34 @@ meego_netbook_netpanel_dispose (GObject *object)
+
+ if (priv->entry_table)
+ {
+- clutter_actor_unparent (CLUTTER_ACTOR (priv->entry_table));
++ clutter_actor_destroy (CLUTTER_ACTOR (priv->entry_table));
+ priv->entry_table = NULL;
+ }
+
+ if (priv->tabs_label)
+ {
+- clutter_actor_unparent (CLUTTER_ACTOR (priv->tabs_label));
++ clutter_actor_destroy (CLUTTER_ACTOR (priv->tabs_label));
+ priv->tabs_label = NULL;
+ }
+
+- if (priv->tabs_view)
++ if (priv->tabs_scrollview)
+ {
+- clutter_actor_unparent (CLUTTER_ACTOR (priv->tabs_view));
+- priv->tabs_view = NULL;
++ clutter_actor_destroy (priv->tabs_scrollview);
++ priv->tabs_scrollview = NULL;
++ priv->tabs_box = NULL;
+ }
+
+ if (priv->favs_label)
+ {
+- clutter_actor_unparent (CLUTTER_ACTOR (priv->favs_label));
++ clutter_actor_destroy (CLUTTER_ACTOR (priv->favs_label));
+ priv->favs_label = NULL;
+ }
+
+- if (priv->favs_view)
++ if (priv->favs_scrollview)
+ {
+- clutter_actor_unparent (CLUTTER_ACTOR (priv->favs_view));
+- priv->favs_view = NULL;
++ clutter_actor_destroy (priv->favs_scrollview);
++ priv->favs_scrollview = NULL;
++ priv->favs_box = NULL;
+ }
+
+ if (priv->places_db)
+@@ -231,16 +234,16 @@ meego_netbook_netpanel_allocate (ClutterActor *actor,
+ clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->tabs_label), width,
+ min_heights + 1, natural_heights + 1);
+
+- if (priv->tabs_view)
+- clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->tabs_view), width,
++ if (priv->tabs_scrollview)
++ clutter_actor_get_preferred_height (priv->tabs_scrollview, width,
+ min_heights + 2, natural_heights + 2);
+
+ if (priv->favs_label)
+ clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->favs_label), width,
+ min_heights + 3, natural_heights + 3);
+
+- if (priv->favs_view)
+- clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->favs_view), width,
++ if (priv->favs_scrollview)
++ clutter_actor_get_preferred_height (priv->favs_scrollview, width,
+ min_heights + 4, natural_heights + 4);
+
+ height = box->y2 - box->y1 - padding.top - padding.bottom;
+@@ -303,10 +306,10 @@ meego_netbook_netpanel_allocate (ClutterActor *actor,
+ child_box.y1 = child_box.y2 + ROW_SPACING;
+ }
+
+- if (priv->tabs_view)
++ if (priv->tabs_scrollview)
+ {
+ child_box.y2 = child_box.y1 + final_heights[2];
+- clutter_actor_allocate (CLUTTER_ACTOR (priv->tabs_view),
++ clutter_actor_allocate (priv->tabs_scrollview,
+ &child_box, flags);
+ child_box.y1 = child_box.y2 + ROW_SPACING;
+ }
+@@ -322,10 +325,10 @@ meego_netbook_netpanel_allocate (ClutterActor *actor,
+ child_box.y1 = child_box.y2 + ROW_SPACING;
+ }
+
+- if (priv->favs_view)
++ if (priv->favs_scrollview)
+ {
+ child_box.y2 = child_box.y1 + final_heights[4];
+- clutter_actor_allocate (CLUTTER_ACTOR (priv->favs_view),
++ clutter_actor_allocate (priv->favs_scrollview,
+ &child_box, flags);
+ }
+ }
+@@ -373,14 +376,14 @@ meego_netbook_netpanel_get_preferred_width (ClutterActor *self,
+ if (priv->tabs_label)
+ expand_to_child_width (CLUTTER_ACTOR (priv->tabs_label), for_height,
+ &min_width, &natural_width);
+- if (priv->tabs_view)
+- expand_to_child_width (CLUTTER_ACTOR (priv->tabs_view), for_height,
++ if (priv->tabs_scrollview)
++ expand_to_child_width (priv->tabs_scrollview, for_height,
+ &min_width, &natural_width);
+ if (priv->favs_label)
+ expand_to_child_width (CLUTTER_ACTOR (priv->favs_label), for_height,
+ &min_width, &natural_width);
+- if (priv->favs_view)
+- expand_to_child_width (CLUTTER_ACTOR (priv->favs_view), for_height,
++ if (priv->favs_scrollview)
++ expand_to_child_width (priv->favs_scrollview, for_height,
+ &min_width, &natural_width);
+
+ if (min_width_p)
+@@ -428,11 +431,11 @@ meego_netbook_netpanel_get_preferred_height (ClutterActor *self,
+ min_height_p, natural_height_p, 0.0);
+ add_child_height (CLUTTER_ACTOR (priv->tabs_label), for_width,
+ min_height_p, natural_height_p, ROW_SPACING);
+- add_child_height (CLUTTER_ACTOR (priv->tabs_view), for_width,
++ add_child_height (priv->tabs_scrollview, for_width,
+ min_height_p, natural_height_p, ROW_SPACING);
+ add_child_height (CLUTTER_ACTOR (priv->favs_label), for_width,
+ min_height_p, natural_height_p, ROW_SPACING);
+- add_child_height (CLUTTER_ACTOR (priv->favs_view), for_width,
++ add_child_height (priv->favs_scrollview, for_width,
+ min_height_p, natural_height_p, ROW_SPACING);
+ }
+
+@@ -446,12 +449,12 @@ meego_netbook_netpanel_paint (ClutterActor *actor)
+
+ if (priv->tabs_label)
+ clutter_actor_paint (CLUTTER_ACTOR (priv->tabs_label));
+- if (priv->tabs_view)
(794 more lines skipped)
++++++ meego-panel-web.yaml
--- meego-panel-web.yaml
+++ meego-panel-web.yaml
@@ -15,6 +15,7 @@
- netpanel-ensure-tile-s-title-is-contained-within-the.patch
- 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
- i18n.patch
+ - 0001-fix-non-painted-items-in-scrollviews.patch
Requires:
- mutter-netbook
More information about the MeeGo-commits
mailing list