[meego-commits] 14821: Changes to Trunk:Testing/meegotouch-compositor
Fathi Boudra
no_reply at build.meego.com
Tue Mar 15 09:12:09 UTC 2011
Hi,
I have made the following changes to meegotouch-compositor in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Fathi Boudra
[This message was auto-generated]
---
Request #14821:
submit: devel:qt-mtf/meegotouch-compositor(r73) -> Trunk:Testing/meegotouch-compositor
Message:
- added BMC_14207_double_xterm_thumbnail.patch
- added temp BMC_13622_statusbar.patch
- added temp BMC_13622_statusbar_2.patch
State: new 2011-03-15T02:12:02 boudra
Comment: None
changes files:
--------------
--- meegotouch-compositor.changes
+++ meegotouch-compositor.changes
@@ -0,0 +1,5 @@
+Thu Mar 11 2011 Miroslav Safr <miroslav.safr at tieto.com.com> 0.8.5
+- added BMC_14207_double_xterm_thumbnail.patch
+- added temp BMC_13622_statusbar.patch
+- added temp BMC_13622_statusbar_2.patch
+
new:
----
BMC_13622_statusbar.patch
BMC_13622_statusbar_2.patch
BMC_14207_double_xterm_thumbnail.patch
spec files:
-----------
--- meegotouch-compositor.spec
+++ meegotouch-compositor.spec
@@ -18,6 +18,9 @@
Patch0: add_Xext_lib_to_windowctl.patch
Patch1: initialize_EGL_library.patch
Patch2: do_not_use_TFP_when_EGL_KHR_image_pixmap_extension_is_missing_bmc11128.patch
+Patch3: BMC_13622_statusbar.patch
+Patch4: BMC_13622_statusbar_2.patch
+Patch5: BMC_14207_double_xterm_thumbnail.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(QtDBus)
@@ -78,6 +81,12 @@
%patch1 -p1
# do_not_use_TFP_when_EGL_KHR_image_pixmap_extension_is_missing_bmc11128.patch
%patch2 -p1
+# BMC_13622_statusbar.patch
+%patch3 -p1
+# BMC_13622_statusbar_2.patch
+%patch4 -p1
+# BMC_14207_double_xterm_thumbnail.patch
+%patch5 -p1
# >> setup
# << setup
other changes:
--------------
++++++ BMC_13622_statusbar.patch (new)
--- BMC_13622_statusbar.patch
+++ BMC_13622_statusbar.patch
+From 7c3c10e72375c2ab573886058aac9c5c244f5588 Mon Sep 17 00:00:00 2001
+From: Alexandr Ivanov <alexandr.ivanov at tieto.com>
+Date: Fri, 25 Feb 2011 12:00:32 +0200
+Subject: [PATCH] Fixes: BMC#13622, xterm terminal screen display has error
+
+RevBy:
+
+Details: SystemUI statusBar can be NULL
+---
+ decorators/mdecorator/mdecoratorwindow.cpp | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/decorators/mdecorator/mdecoratorwindow.cpp b/decorators/mdecorator/mdecoratorwindow.cpp
+index 8085aa0..7193ebe 100644
+--- a/decorators/mdecorator/mdecoratorwindow.cpp
++++ b/decorators/mdecorator/mdecoratorwindow.cpp
+@@ -292,8 +292,8 @@ MDecoratorWindow::MDecoratorWindow(QWidget *parent)
+ }
+ }
+
+-
+- if (!homeButtonPanel || !navigationBar || !statusBar)
++ // Check for presence of homeButtonPanel and navigationBar, statusBar can be NULL
++ if (!homeButtonPanel || !navigationBar)
+ qFatal("Meego elements not found");
+
+ homeButtonPanel = new MHomeButtonPanel();
+@@ -528,9 +528,12 @@ void MDecoratorWindow::setInputRegion()
+ region = fs;
+ } else {
+ // Decoration includes the status bar, and possibly other elements.
+- QRect sbrect = statusBar->geometry().toRect();
+- if (statusBarHeight)
+- sbrect.setHeight(statusBarHeight);
++ QRect sbrect;
++ if (statusBar) {
++ sbrect = statusBar->geometry().toRect();
++ if (statusBarHeight)
++ sbrect.setHeight(statusBarHeight);
++ }
+ region = sbrect;
+ if (!only_statusbar) {
+ region += navigationBar->geometry().toRect();
+--
+1.6.1
++++++ BMC_13622_statusbar_2.patch (new)
--- BMC_13622_statusbar_2.patch
+++ BMC_13622_statusbar_2.patch
+>From b2720fe21f8d97c050c160aa1cda9adab87dca05 Mon Sep 17 00:00:00 2001
+From: Alexandr Ivanov <alexandr.ivanov at tieto.com>
+Date: Fri, 25 Feb 2011 12:11:06 +0200
+Subject: [PATCH] Fixes: BMC#11531, issues with toolbar/statusbar alignment
+
+RevBy:
+
+Details: As part of fixing https://bugs.meego.com/show_bug.cgi?id=12753
+SystemUI statusbar height reported by geometry is wrong, and geometry() of navigation bar, etc
+is always starts at (0,0), real position on scene is sceneBoundingRect()
+---
+ decorators/mdecorator/mdecoratorwindow.cpp | 22 ++++++----------------
+ decorators/mdecorator/mdecoratorwindow.h | 1 -
+ 2 files changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/decorators/mdecorator/mdecoratorwindow.cpp b/decorators/mdecorator/mdecoratorwindow.cpp
+index 7193ebe..917ba58 100644
+--- a/decorators/mdecorator/mdecoratorwindow.cpp
++++ b/decorators/mdecorator/mdecoratorwindow.cpp
+@@ -245,7 +245,6 @@ MDecoratorWindow::MDecoratorWindow(QWidget *parent)
+ escapeButtonPanel(0),
+ navigationBar(0),
+ statusBar(0),
+- statusBarHeight(0),
+ messageBox(0),
+ managed_window(0),
+ menuVisible(false)
+@@ -278,15 +277,6 @@ MDecoratorWindow::MDecoratorWindow(QWidget *parent)
+ if (!statusBar) {
+ statusBar = dynamic_cast<MStatusBar*>(item);
+ if (statusBar) {
+- // We can't believe statusBar.geometry() because it
+- // includes some unwanted margins. Get straight the
+- // constant if available.
+- MDeviceProfile *dev = MDeviceProfile::instance();
+- QSettings ini("/usr/share/themes/base/meegotouch/constants.ini",
+- QSettings::IniFormat);
+- QString mm = ini.value("Sizes/HEIGHT_STATUSBAR").toString();
+- if (mm.endsWith("mm"))
+- statusBarHeight = dev->mmToPixels(atoi(mm.toLatin1().constData()));
+ continue;
+ }
+ }
+@@ -530,16 +520,16 @@ void MDecoratorWindow::setInputRegion()
+ // Decoration includes the status bar, and possibly other elements.
+ QRect sbrect;
+ if (statusBar) {
+- sbrect = statusBar->geometry().toRect();
+- if (statusBarHeight)
+- sbrect.setHeight(statusBarHeight);
++ sbrect = statusBar->sceneBoundingRect().toRect();
++ sbrect.setHeight(statusBar->property("sharedPixmapHeight").value<qreal>());
+ }
+ region = sbrect;
++
+ if (!only_statusbar) {
+- region += navigationBar->geometry().toRect();
+- region += homeButtonPanel->geometry().toRect();
++ region += navigationBar->sceneBoundingRect().toRect();
++ region += homeButtonPanel->sceneBoundingRect().toRect();
+ if (escapeButtonPanel)
+- region += escapeButtonPanel->geometry().toRect();
++ region += escapeButtonPanel->sceneBoundingRect().toRect();
+ }
+
+ // The coordinates we receive from libmeegotouch are rotated
+diff --git a/decorators/mdecorator/mdecoratorwindow.h b/decorators/mdecorator/mdecoratorwindow.h
+index e0c043d..ad919a7 100644
+--- a/decorators/mdecorator/mdecoratorwindow.h
++++ b/decorators/mdecorator/mdecoratorwindow.h
+@@ -90,7 +90,6 @@ private:
+ MEscapeButtonPanel *escapeButtonPanel;
+ MNavigationBar *navigationBar;
+ MStatusBar *statusBar;
+- unsigned statusBarHeight;
+ MMessageBox *messageBox;
+ Window managed_window;
+ QRect availableRect; // available area for the managed window
+--
+1.6.1
+
++++++ BMC_14207_double_xterm_thumbnail.patch (new)
--- BMC_14207_double_xterm_thumbnail.patch
+++ BMC_14207_double_xterm_thumbnail.patch
+From 7b9d8133ddde43ef5ca9fa69760ad1c9795c7ba4 Mon Sep 17 00:00:00 2001
+From: Alexandr Ivanov <alexandr.ivanov at tieto.com>
+Date: Fri, 11 Mar 2011 14:46:47 +0200
+Subject: [PATCH] Fixes: BMC#14207, Double xterm thumbnail windows are displayed when relaunched xterm after specific steps
+
+RevBy:
+
+Details: MDecoratorWindow::setInputRegion returns empty region then menuVisible is set. That works incorrectly because if there is no menu: menuVisible never set to false
+---
+ decorators/mdecorator/mdecoratorwindow.cpp | 14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/decorators/mdecorator/mdecoratorwindow.cpp b/decorators/mdecorator/mdecoratorwindow.cpp
+index 4e33845..4ec3854 100644
+--- a/decorators/mdecorator/mdecoratorwindow.cpp
++++ b/decorators/mdecorator/mdecoratorwindow.cpp
+@@ -472,6 +472,7 @@ void MDecoratorWindow::setInputRegion()
+ const QRegion fs(QApplication::desktop()->screenGeometry());
+ // region := decoration region
+ if (messageBox || menuVisible) {
++ //TODO Is this correct? returns empty region: availableRect = (fs - region)
+ // Occupy all space.
+ region = fs;
+ } else {
+@@ -602,19 +603,24 @@ void MDecoratorWindow::menuAppearing()
+ {
+ if (menuVisible)
+ return;
+- menuVisible=true;
++
+ foreach (QGraphicsItem* item, items()) {
+ MApplicationMenu *menu = dynamic_cast<MApplicationMenu*>(item);
+ if (menu) {
+ connect(menu, SIGNAL(disappeared()), SLOT(menuDisappeared()));
+ connect(this, SIGNAL(displayExited()), menu, SLOT(disappear()));
++
++ menuVisible = true;
+ }
+ }
+
+- QPixmap pix = QPixmap::grabWindow(winId());
+- setBackgroundBrush(pix);
++ // Only if menu exists, or menuDisappeared never called
++ if (menuVisible) {
++ QPixmap pix = QPixmap::grabWindow(winId());
++ setBackgroundBrush(pix);
+
+- setInputRegion();
++ setInputRegion();
++ }
+ }
+
+ void MDecoratorWindow::menuDisappeared()
+--
+1.6.1
+
++++++ meegotouch-compositor.yaml
--- meegotouch-compositor.yaml
+++ meegotouch-compositor.yaml
@@ -11,6 +11,9 @@
- add_Xext_lib_to_windowctl.patch
- initialize_EGL_library.patch
- do_not_use_TFP_when_EGL_KHR_image_pixmap_extension_is_missing_bmc11128.patch
+ - BMC_13622_statusbar.patch
+ - BMC_13622_statusbar_2.patch
+ - BMC_14207_double_xterm_thumbnail.patch
Description: |
This package contains the Direct UI compositing window manager.
PkgConfigBR:
More information about the MeeGo-commits
mailing list