I have made the following changes intended for : CE:UX:MTF / lipstick-colorful-home CE:UX:MTF / lipstick-example-home CE:UX:MTF / meegotouch-compositor CE:UX:MTF / meegotouch-systemui
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6527 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6527: Messages from BOSS: State: review at 2012-08-31T13:58:03 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / lipstick-colorful-home -> CE:UX:MTF / lipstick-colorful-home changes files: -------------- --- lipstick-colorful-home.changes +++ lipstick-colorful-home.changes @@ -0,0 +1,4 @@ +* Thu Aug 30 2012 Robin Burchell <[email protected]> - 0.0.6 +- Fix a lockscreen bug introduced in v0.0.5, where it would vanish + when the finger was lifted off screen instead of animating away. + old: ---- lipstick-colorful-home-0.0.5.tar.bz2 new: ---- lipstick-colorful-home-0.0.6.tar.bz2 spec files: ----------- --- lipstick-colorful-home.spec +++ lipstick-colorful-home.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 +# Generated by: spectacle version 0.24.1 # Name: lipstick-colorful-home @@ -9,7 +9,7 @@ # << macros Summary: A nice homescreen -Version: 0.0.5 +Version: 0.0.6 Release: 1 Group: System/GUI/Other License: BSD @@ -23,15 +23,17 @@ BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(lipstick) Provides: meegotouch-home > 1.3.2 +Provides: meegotouch-systemui-screenlock-padlock > 1.3.2 Conflicts: lipstick-example-home Obsoletes: meegotouch-home <= 1.3.2 +Obsoletes: meegotouch-systemui-screenlock-padlock <= 1.3.2 %description A homescreen for Nemo Mobile %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name} # >> setup # << setup other changes: -------------- ++++++ lipstick-colorful-home-0.0.5.tar.bz2 -> lipstick-colorful-home-0.0.6.tar.bz2 --- src/qml/components/Lockscreen.qml +++ src/qml/components/Lockscreen.qml @@ -3,7 +3,6 @@ Rectangle { id: lockScreen color: "red" - visible: LipstickSettings.lockscreenVisible states: [ State { ++++++ lipstick-colorful-home.yaml --- lipstick-colorful-home.yaml +++ lipstick-colorful-home.yaml @@ -1,6 +1,6 @@ Name: lipstick-colorful-home Summary: A nice homescreen -Version: 0.0.5 +Version: 0.0.6 Release: 1 Group: System/GUI/Other License: BSD @@ -10,8 +10,10 @@ - lipstick.desktop Provides: - meegotouch-home > 1.3.2 + - meegotouch-systemui-screenlock-padlock > 1.3.2 Obsoletes: - meegotouch-home <= 1.3.2 + - meegotouch-systemui-screenlock-padlock <= 1.3.2 Description: A homescreen for Nemo Mobile Builder: qmake Requires: submit: Project:MTF:UX / lipstick-example-home -> CE:UX:MTF / lipstick-example-home changes files: -------------- --- lipstick-example-home.changes +++ lipstick-example-home.changes @@ -0,0 +1,3 @@ +* Thu Aug 30 2012 Robin Burchell <[email protected]> - 0.0.2 +- Implement simple lockscreen support + old: ---- lipstick-example-home-0.0.1.tar.bz2 new: ---- lipstick-example-home-0.0.2.tar.bz2 spec files: ----------- --- lipstick-example-home.spec +++ lipstick-example-home.spec @@ -9,7 +9,7 @@ # << macros Summary: Example homescreen for lipstick -Version: 0.0.1 +Version: 0.0.2 Release: 1 Group: System/GUI/Other License: BSD @@ -21,7 +21,11 @@ BuildRequires: pkgconfig(QtDeclarative) BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(lipstick) -Conflicts: meegotouch-home +Provides: meegotouch-home > 1.3.2 +Provides: meegotouch-systemui-screenlock-padlock > 1.3.2 +Conflicts: lipstick-colorful-home +Obsoletes: meegotouch-home <= 1.3.2 +Obsoletes: meegotouch-systemui-screenlock-padlock <= 1.3.2 %description A simple example homescreen other changes: -------------- ++++++ lipstick-example-home-0.0.1.tar.bz2 -> lipstick-example-home-0.0.2.tar.bz2 --- main.cpp +++ main.cpp @@ -1,19 +1,25 @@ - -// This file is part of lipstick, a QML desktop library -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License version 2.1 as published by the Free Software Foundation -// and appearing in the file LICENSE.LGPL included in the packaging -// of this file. -// -// This code is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// Copyright (c) 2011, Robin Burchell -// Copyright (c) 2012, Timur Kristóf <[email protected]> +/* + * Copyright (c) 2012 - Timur Kristóf <[email protected]> + * Copyright (c) 2011 - Robin Burchell <[email protected]> + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ #include <QDebug> #include <homeapplication.h> --- qml/Lockscreen.qml +++ qml/Lockscreen.qml @@ -0,0 +1,77 @@ +import QtQuick 1.1 + +Rectangle { + id: lockScreen + color: "red" + + states: [ + State { + name: "locked" + when: LipstickSettings.lockscreenVisible + PropertyChanges { + target: lockScreen + y: 0 + } + }, + State { + name: "unlocked" + when: !LipstickSettings.lockscreenVisible + PropertyChanges { + target: lockScreen + y: -lockScreen.height + } + } + ] + transitions: Transition { + PropertyAnimation { + properties: "y" + easing.type: Easing.OutBounce + duration: 400 + } + } + + MouseArea { + property int pressY: 0 + anchors.fill: parent + + onPressed: pressY = mouseY + onPositionChanged: { + var delta = pressY - mouseY + pressY = mouseY + delta + if (parent.y - delta > 0) + return + parent.y = parent.y - delta + } + onReleased: { + if (Math.abs(parent.y) > parent.height / 3) { + console.log("Going away") + + LipstickSettings.lockscreenVisible = false + } else if (LipstickSettings.lockscreenVisible) { + console.log("No dice") + parent.state = "unlocked" + parent.state = "locked" + } + } + } + + Text { + id: time + text: Qt.formatDateTime(new Date(), "hh:mm") + font.pixelSize: 130 + color: "white" + horizontalAlignment: Text.AlignHCenter + anchors.top: parent.top + width: parent.width + } + + Text { + horizontalAlignment: Text.AlignHCenter + anchors.top: time.bottom + text: Qt.formatDateTime(new Date(), "dd/MM/yyyy") + color: "white" + font.pixelSize: 50 + width: parent.width + } +} + --- qml/main.qml +++ qml/main.qml @@ -129,5 +129,11 @@ } } } + + Lockscreen { + height: desktop.height + width: desktop.width + z: 200 + } } } --- res.qrc +++ res.qrc @@ -4,8 +4,8 @@ <file>qml/Switcher.qml</file> <file>qml/SwitcherItem.qml</file> <file>qml/Launcher.qml</file> + <file>qml/Lockscreen.qml</file> </qresource> - <qresource prefix="/js"/> <qresource prefix="/images"> <file alias="background.jpg">images/clarity_03_by_pr09studio.jpg</file> </qresource> ++++++ lipstick-example-home.yaml --- lipstick-example-home.yaml +++ lipstick-example-home.yaml @@ -1,6 +1,6 @@ Name: lipstick-example-home Summary: Example homescreen for lipstick -Version: 0.0.1 +Version: 0.0.2 Release: 1 Group: System/GUI/Other License: BSD @@ -15,7 +15,13 @@ - QtDeclarative - QtOpenGL # TODO: remove - lipstick +Provides: + - meegotouch-home > 1.3.2 + - meegotouch-systemui-screenlock-padlock > 1.3.2 +Obsoletes: + - meegotouch-home <= 1.3.2 + - meegotouch-systemui-screenlock-padlock <= 1.3.2 Conflicts: - - meegotouch-home + - lipstick-colorful-home Files: - "%{_bindir}/lipstick" submit: Project:MTF:UX / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor changes files: -------------- --- meegotouch-compositor.changes +++ meegotouch-compositor.changes @@ -0,0 +1,8 @@ +* Thu Aug 30 2012 Robin Burchell <[email protected]> - 1.1.31-1 +- Remove no_mce.patch. Breaks lipstick homescreen, wastes battery, not useful. +- Add 0001-remove-lockscreen_painted-waiting-logic.patch, waiting for lockscreen + paints is no longer necessary. +- Add 0001-sort-lockscreens-before-checking-desktops.patch, lockscreen should + always be sorted above everything. Required now the desktop can also be a + lockscreen. + old: ---- no_mce.patch new: ---- 0001-remove-lockscreen_painted-waiting-logic.patch 0001-sort-lockscreens-before-checking-desktops.patch spec files: ----------- --- meegotouch-compositor.spec +++ meegotouch-compositor.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24.1 # + +Name: meegotouch-compositor + # >> macros # << macros -Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager Version: 1.1.31 Release: 1 @@ -17,16 +19,17 @@ Source2: X-MEEGO-HS.desktop Source100: meegotouch-compositor.yaml Patch0: BMC_14207_double_xterm_thumbnail.patch -Patch1: no_mce.patch -Patch2: XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch -Patch3: Use-QTransform-rather-than-the-deprecated-matrix-cla.patch -Patch4: fix_windowctl_test_linkage.patch -Patch5: new_test_definitions.patch -Patch6: BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch -Patch7: BMC_22845_move-var-run-to-home.patch -Patch8: fix_animations_for_gestures_plugin.patch -Patch9: fix_tfp_on_lenovo.patch -Patch10: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch +Patch1: XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch +Patch2: Use-QTransform-rather-than-the-deprecated-matrix-cla.patch +Patch3: fix_windowctl_test_linkage.patch +Patch4: new_test_definitions.patch +Patch5: BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch +Patch6: BMC_22845_move-var-run-to-home.patch +Patch7: fix_animations_for_gestures_plugin.patch +Patch8: fix_tfp_on_lenovo.patch +Patch9: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch +Patch10: 0001-sort-lockscreens-before-checking-desktops.patch +Patch11: 0001-remove-lockscreen_painted-waiting-logic.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtDBus) @@ -45,6 +48,7 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(mce) BuildRequires: test-definition BuildRequires: doxygen Provides: duicompositor >= 0.3.9 @@ -52,12 +56,10 @@ Obsoletes: duicompositor < 0.3.9 Obsoletes: mcompositor < 0.4.6 - %description This package contains the Direct UI compositing window manager. - %package devel Summary: Development files for building mcompositor decorators Group: Development/Libraries @@ -84,26 +86,28 @@ # BMC_14207_double_xterm_thumbnail.patch %patch0 -p1 -# no_mce.patch -%patch1 -p1 # XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch -%patch2 -p1 +%patch1 -p1 # Use-QTransform-rather-than-the-deprecated-matrix-cla.patch -%patch3 -p1 +%patch2 -p1 # fix_windowctl_test_linkage.patch -%patch4 -p1 +%patch3 -p1 # new_test_definitions.patch -%patch5 -p1 +%patch4 -p1 # BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch -%patch6 -p1 +%patch5 -p1 # BMC_22845_move-var-run-to-home.patch -%patch7 -p1 +%patch6 -p1 # fix_animations_for_gestures_plugin.patch -%patch8 -p1 +%patch7 -p1 # fix_tfp_on_lenovo.patch -%patch9 -p1 +%patch8 -p1 # meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch +%patch9 -p1 +# 0001-sort-lockscreens-before-checking-desktops.patch %patch10 -p1 +# 0001-remove-lockscreen_painted-waiting-logic.patch +%patch11 -p1 # >> setup # << setup @@ -117,6 +121,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -132,18 +137,10 @@ # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - - - %files %defattr(-,root,root,-) # >> files @@ -157,7 +154,6 @@ %{_datadir}/xsessions/X-MEEGO-HS.desktop # << files - %files devel %defattr(-,root,root,-) # >> files devel @@ -205,4 +201,3 @@ %{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.py %{_datadir}/meegotouch/testscripts/mcompositor-functional-tests/test*.sh # << files tests - other changes: -------------- ++++++ 0001-remove-lockscreen_painted-waiting-logic.patch (new) --- 0001-remove-lockscreen_painted-waiting-logic.patch +++ 0001-remove-lockscreen_painted-waiting-logic.patch @@ -0,0 +1,231 @@ +From 271410c9f4c870c615010884de12221f4d09c449 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Sat, 25 Aug 2012 11:34:31 +0200 +Subject: [PATCH] remove lockscreen_painted waiting/logic + +with the lockscreen now part of the homescreen, it should always be painted. +--- + src/mcompositemanager.cpp | 76 +++++++-------------------- + src/mcompositemanager.h | 1 - + src/mcompositemanager_p.h | 2 - + src/mcompositewindow.cpp | 1 - + tests/unit/ut_lockscreen/ut_lockscreen.cpp | 2 - + 5 files changed, 20 insertions(+), 62 deletions(-) + +diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp +index 1e58520..92fcb57 100644 +--- a/src/mcompositemanager.cpp ++++ b/src/mcompositemanager.cpp +@@ -429,8 +429,7 @@ MCompositeManagerPrivate::MCompositeManagerPrivate(MCompositeManager *p) + defaultGraphicsAlpha(MAXIMUM_GLOBAL_ALPHA), + defaultVideoAlpha(MAXIMUM_GLOBAL_ALPHA), + globalAlphaOverridden(false), +- disable_redrawing_due_to_damage(false), +- lockscreen_painted(false) ++ disable_redrawing_due_to_damage(false) + { + xcb_conn = XGetXCBConnection(QX11Info::display()); + MWindowPropertyCache::set_xcb_connection(xcb_conn); +@@ -447,11 +446,6 @@ MCompositeManagerPrivate::MCompositeManagerPrivate(MCompositeManager *p) + this, SLOT(callOngoing(bool))); + stacking_timer.setSingleShot(true); + connect(&stacking_timer, SIGNAL(timeout()), this, SLOT(stackingTimeout())); +- lockscreen_map_timer.setSingleShot(true); +- lockscreen_map_timer.setInterval(qobject_cast<MCompositeManager*>(p)-> +- configInt("lockscreen-map-timeout-ms")); +- connect(&lockscreen_map_timer, SIGNAL(timeout()), p, +- SLOT(lockScreenPainted())); + } + + MCompositeManagerPrivate::~MCompositeManagerPrivate() +@@ -621,6 +615,7 @@ void MCompositeManagerPrivate::damageEvent(XDamageNotifyEvent *e) + MCompositeWindow *item = COMPOSITE_WINDOW(e->drawable); + if (item) { + item->propertyCache()->damageReceived(); ++ + /* partial updates disabled for now, does not always work, unless we + * check for EGL_BUFFER_PRESERVED or GLX_SWAP_COPY_OML first, see + * http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html and +@@ -1085,8 +1080,6 @@ void MCompositeManagerPrivate::unmapEvent(XUnmapEvent *e) + XRemoveFromSaveSet(QX11Info::display(), e->window); + if (wpc->isDecorator()) + MDecoratorFrame::instance()->setDecoratorItem(0); +- if (wpc->isLockScreen()) +- lockscreen_painted = false; + } + + // do not keep unmapped windows in windows_as_mapped list +@@ -2145,14 +2138,6 @@ void MCompositeManagerPrivate::mapEvent(XMapEvent *e, bool startup) + + pc->setBeingMapped(false); + pc->setIsMapped(true); +- if (pc->isLockScreen()) { +- lockscreen_map_timer.stop(); +- if (e->send_event == False) +- lockscreen_painted = false; +- else +- // we just started -> don't expect any damage +- lockscreen_painted = true; +- } + + #ifdef ENABLE_BROKEN_SIMPLEWINDOWFRAME + FrameData fd = framed_windows.value(win); +@@ -2737,14 +2722,6 @@ void MCompositeManagerPrivate::activateWindow(Window w, Time timestamp, + dirtyStacking(false); + } + +-void MCompositeManager::lockScreenPainted() +-{ +- d->lockscreen_painted = true; +- if (!d->device_state->displayOff()) +- d->displayOff(false); +- d->watch->keep_black = false; +-} +- + MWindowPropertyCache *MCompositeManagerPrivate::findLockScreen() const + { + for (QHash<Window, MWindowPropertyCache*>::const_iterator +@@ -2759,36 +2736,32 @@ void MCompositeManagerPrivate::displayOff(bool display_off) + if (display_off) { + if (splash) + splashTimeout(); +- lockscreen_map_timer.stop(); + if (!haveMappedWindow()) + enableCompositing(); + MWindowPropertyCache *pc; + MCompositeWindow *cw; +- if (!(pc = findLockScreen()) || !(cw = COMPOSITE_WINDOW(pc->winId())) +- || !pc->isMapped() || !cw->paintedAfterMapping()) +- lockscreen_painted = false; ++ + // check whether there is a low-power mode window visible -- when the + // lockscreen is visible we trust it to become the low-power mode window + // even if the flag is not yet set +- bool lpm_window = lockscreen_painted; +- if (!lpm_window) { +- int covering_i = indexOfLastVisibleWindow(); +- for (int i = stacking_list.size() - 1; i >= covering_i; --i) { +- Window w = stacking_list[i]; +- MWindowPropertyCache *pc = prop_caches.value(w, 0); +- if (pc && pc->isMapped() && pc->lowPowerMode() > 0) { +- lpm_window = true; +- break; +- } +- } +- if (!lpm_window) { +- watch->keep_black = true; +- if (!compositing) +- enableCompositing(); +- else +- glwidget->update(); ++ int covering_i = indexOfLastVisibleWindow(); ++ bool lpm_window = false; ++ for (int i = stacking_list.size() - 1; i >= covering_i; --i) { ++ Window w = stacking_list[i]; ++ MWindowPropertyCache *pc = prop_caches.value(w, 0); ++ if (pc && pc->isMapped() && pc->lowPowerMode() > 0) { ++ lpm_window = true; ++ break; + } + } ++ if (!lpm_window) { ++ watch->keep_black = true; ++ if (!compositing) ++ enableCompositing(); ++ else ++ glwidget->update(); ++ } ++ + /* stop pinging to save some battery */ + for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin(); + it != windows.end(); ++it) { +@@ -2805,15 +2778,6 @@ void MCompositeManagerPrivate::displayOff(bool display_off) + i->propertyCache()->damageTracking(false); + } + } else { +- MWindowPropertyCache *pc; +- if (device_state->touchScreenLock() == "locked" && +- !lockscreen_painted && (pc = findLockScreen())) { +- // lockscreen not painted yet: wait for painting or timeout +- if (!pc->isMapped()) +- // give it little time to map but not for ever +- lockscreen_map_timer.start(); +- return; +- } + watch->keep_black = false; + glwidget->update(); + if (!possiblyUnredirectTopmostWindow() && !compositing) +@@ -4600,7 +4564,7 @@ void MCompositeManager::ensureSettingsFile() + config("damage-timeout-ms", 500); + config("expect-resize-timeout-ms", 800); + config("splash-timeout-ms", 30000); +- config("lockscreen-map-timeout-ms", 1000); ++ config("lockscreen-map-timeout-ms", 1000); // TODO: unused now? + config("default-statusbar-height", 36); + config("default-desktop-angle", 270); + config("close-timeout-ms", 5000); +diff --git a/src/mcompositemanager.h b/src/mcompositemanager.h +index 91a96e2..b7e7136 100644 +--- a/src/mcompositemanager.h ++++ b/src/mcompositemanager.h +@@ -296,7 +296,6 @@ public slots: + void windowBound(MCompositeWindow* window); + + private slots: +- void lockScreenPainted(); + void handleSigHup(); + + private: +diff --git a/src/mcompositemanager_p.h b/src/mcompositemanager_p.h +index b14057f..65aba29 100644 +--- a/src/mcompositemanager_p.h ++++ b/src/mcompositemanager_p.h +@@ -210,7 +210,6 @@ public: + void pingTopmost(); + MSplashScreen *splash; + QPointer<MCompositeWindow> waiting_damage; +- QTimer lockscreen_map_timer; + QSocketNotifier *sighupNotifier; + + struct DismissedSplash { +@@ -251,7 +250,6 @@ public: + int defaultVideoAlpha; + bool globalAlphaOverridden; + bool disable_redrawing_due_to_damage; +- bool lockscreen_painted; + + signals: + void currentAppChanged(Window w); +diff --git a/src/mcompositewindow.cpp b/src/mcompositewindow.cpp (32 more lines skipped) ++++++ 0001-sort-lockscreens-before-checking-desktops.patch (new) --- 0001-sort-lockscreens-before-checking-desktops.patch +++ 0001-sort-lockscreens-before-checking-desktops.patch @@ -0,0 +1,35 @@ +From 67c378b2feee1d50b54311af3e59dd6521fbecf5 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Thu, 23 Aug 2012 20:03:05 +0200 +Subject: [PATCH] sort lockscreens before checking desktops + +allows lipstick to also act as a lockscreen if needed +--- + src/mcompositemanager.cpp | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp +index 93dffa0..1e58520 100644 +--- a/src/mcompositemanager.cpp ++++ b/src/mcompositemanager.cpp +@@ -3338,6 +3338,17 @@ static bool compareWindows(Window w_a, Window w_b) + goto use_old_order; + } + ++ if (pc_a->isLockScreen()) { ++ // if a is a lockscreen, and b isn't, then don't sort a below b ++ if (!pc_b->isLockScreen()) ++ SORTING(false, "A LOCKSCREEN"); ++ // otherwise fallthrough, they're both lockscreens, more comparison ++ // needed ++ } else if (pc_b->isLockScreen()) { ++ // b is a lockscreen, and a isn't, then sort a below b ++ SORTING(true, "B LOCKSCREEN"); ++ } ++ + // Both @pc_a and @pc_b are in NormalState. + // Sort the desktop below all NormalState windows. + // (Quiz: why do we check @pc_b before @pc_a? +-- +1.7.7.5 (Apple Git-26) + ++++++ meegotouch-compositor.yaml --- meegotouch-compositor.yaml +++ meegotouch-compositor.yaml @@ -12,7 +12,6 @@ - X-MEEGO-HS.desktop;%{_datadir}/xsessions/ Patches: - BMC_14207_double_xterm_thumbnail.patch - - no_mce.patch - XSync-after-un-redirecting-windows-in-EGL-MTexturePi.patch - Use-QTransform-rather-than-the-deprecated-matrix-cla.patch - fix_windowctl_test_linkage.patch @@ -22,6 +21,8 @@ - fix_animations_for_gestures_plugin.patch - fix_tfp_on_lenovo.patch - meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch + - 0001-sort-lockscreens-before-checking-desktops.patch + - 0001-remove-lockscreen_painted-waiting-logic.patch Description: | This package contains the Direct UI compositing window manager. PkgConfigBR: @@ -41,7 +42,7 @@ - xrender - xrandr - xi -# - mce + - mce PkgBR: - test-definition - doxygen ++++++ deleted files: --- no_mce.patch submit: Project:MTF:UX / meegotouch-systemui -> CE:UX:MTF / meegotouch-systemui changes files: -------------- --- meegotouch-systemui.changes +++ meegotouch-systemui.changes @@ -0,0 +1,5 @@ +* Thu Aug 30 2012 Robin Burchell <[email protected]> - 1.4.0 +- Move to our own git repository, integrate pretty much all existing patches +- Add 0001-rip-out-screenlock-support-from-systemui.patch, experimental + support for ripping sysuid lockscreen out. + old: ---- Add-shutdown-dialog-to-status-indicator-menu.patch BMC_14815_statusbar_width_for_default_portrait.patch BMC_14873_reset_dad_on_rotation.patch BMC_16893-MR_5.patch BMC_17258_Profile_Dialog_replaced_by_settings_profileapplet.patch BMC_17553-DE-N900-Notification-cloud-in-notifi.patch BMC_19366_System_top_bar_items_are_mis-aligned.patch BMC_21860_battery_charging_animation.patch BMC_9319_pulseaudio-client.patch BMC_9319_volume_control_images.patch BMC_9940-No-new-email-notification-is-displayed.patch Battery-ChargePercentage-for-battery-capacity.patch NEMO_11_remove_profile_from_statusmenu.patch NEMO_12_fix_statusmenu_top.patch meegotouch-meegotouch-systemui-1.3.2-1.tar.gz meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch systemui-show-Developer-MTP-mode.patch temp_BMC_17585_unlock_device_from_lock_screen.patch new: ---- meegotouch-systemui-1.4.0.tar.bz2 spec files: ----------- --- meegotouch-systemui.spec +++ meegotouch-systemui.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 +# Generated by: spectacle version 0.24.1 # Name: meegotouch-systemui @@ -9,33 +9,16 @@ # << macros Summary: System UI daemon -Version: 1.3.2 +Version: 1.4.0 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: https://github.com/nemomobile/meegotouch-systemui -Source0: meegotouch-%{name}-%{version}-1.tar.gz +Source0: %{name}-%{version}.tar.bz2 Source1: boss.conf Source2: meegotouch-systemui.desktop Source3: lock.desktop Source100: meegotouch-systemui.yaml -Patch0: Battery-ChargePercentage-for-battery-capacity.patch -Patch1: temp_BMC_17585_unlock_device_from_lock_screen.patch -Patch2: BMC_14873_reset_dad_on_rotation.patch -Patch3: BMC_17553-DE-N900-Notification-cloud-in-notifi.patch -Patch4: BMC_9940-No-new-email-notification-is-displayed.patch -Patch5: BMC_17258_Profile_Dialog_replaced_by_settings_profileapplet.patch -Patch6: BMC_9319_pulseaudio-client.patch -Patch7: BMC_9319_volume_control_images.patch -Patch8: BMC_14815_statusbar_width_for_default_portrait.patch -Patch9: BMC_21860_battery_charging_animation.patch -Patch10: BMC_19366_System_top_bar_items_are_mis-aligned.patch -Patch11: BMC_16893-MR_5.patch -Patch12: NEMO_11_remove_profile_from_statusmenu.patch -Patch13: NEMO_12_fix_statusmenu_top.patch -Patch14: meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch -Patch15: Add-shutdown-dialog-to-status-indicator-menu.patch -Patch16: systemui-show-Developer-MTP-mode.patch Requires: contextkit-meego-cellular Requires: contextkit-meego-internet BuildRequires: pkgconfig(libpulse) @@ -71,15 +54,6 @@ This package contains the system UI daemon development files. -%package screenlock-padlock -Summary: Screen lock extension for system-ui with a padlock -Group: System/GUI/Other -Requires: %{name} = %{version}-%{release} - -%description screenlock-padlock -This package contains the screen lock extension for system-ui with a padlock. - - %package volume-fullscreen Summary: Volume fullscreen extension for system-ui Group: System/GUI/Other @@ -132,42 +106,8 @@ %prep -%setup -q -n meegotouch-%{name} +%setup -q -n %{name} -# Battery-ChargePercentage-for-battery-capacity.patch -%patch0 -p1 -# temp_BMC_17585_unlock_device_from_lock_screen.patch -%patch1 -p1 -# BMC_14873_reset_dad_on_rotation.patch -%patch2 -p1 -# BMC_17553-DE-N900-Notification-cloud-in-notifi.patch -%patch3 -p1 -# BMC_9940-No-new-email-notification-is-displayed.patch -%patch4 -p1 -# BMC_17258_Profile_Dialog_replaced_by_settings_profileapplet.patch -%patch5 -p1 -# BMC_9319_pulseaudio-client.patch -%patch6 -p1 -# BMC_9319_volume_control_images.patch -%patch7 -p1 -# BMC_14815_statusbar_width_for_default_portrait.patch -%patch8 -p1 -# BMC_21860_battery_charging_animation.patch -%patch9 -p1 -# BMC_19366_System_top_bar_items_are_mis-aligned.patch -%patch10 -p1 -# BMC_16893-MR_5.patch -%patch11 -p1 -# NEMO_11_remove_profile_from_statusmenu.patch -%patch12 -p1 -# NEMO_12_fix_statusmenu_top.patch -%patch13 -p1 -# meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch -%patch14 -p1 -# Add-shutdown-dialog-to-status-indicator-menu.patch -%patch15 -p1 -# systemui-show-Developer-MTP-mode.patch -%patch16 -p1 # >> setup # << setup @@ -228,15 +168,6 @@ # >> files devel # << files devel -%files screenlock-padlock -%defattr(-,root,root,-) -%{_libdir}/meegotouch/applicationextensions/libsysuid-screenlock.so -%{_datadir}/meegotouch/applicationextensions/sysuid-screenlock.desktop -%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/*.conf -%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/style/*.css -# >> files screenlock-padlock -# << files screenlock-padlock - %files volume-fullscreen %defattr(-,root,root,-) %{_libdir}/meegotouch/applicationextensions/libsysuid-volume.so other changes: -------------- ++++++ meegotouch-systemui-1.4.0.tar.bz2 (new) ++++++ meegotouch-systemui.yaml --- meegotouch-systemui.yaml +++ meegotouch-systemui.yaml @@ -1,34 +1,16 @@ Name: meegotouch-systemui Summary: System UI daemon -Version: 1.3.2 +Version: 1.4.0 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: https://github.com/nemomobile/meegotouch-systemui Sources: - - "meegotouch-%{name}-%{version}-1.tar.gz" + - "%{name}-%{version}.tar.bz2" - "boss.conf" ExtraSources: - meegotouch-systemui.desktop;%{_sysconfdir}/xdg/autostart - lock.desktop;%{_datadir}/applications -Patches: - - Battery-ChargePercentage-for-battery-capacity.patch - - temp_BMC_17585_unlock_device_from_lock_screen.patch - - BMC_14873_reset_dad_on_rotation.patch - - BMC_17553-DE-N900-Notification-cloud-in-notifi.patch - - BMC_9940-No-new-email-notification-is-displayed.patch - - BMC_17258_Profile_Dialog_replaced_by_settings_profileapplet.patch - - BMC_9319_pulseaudio-client.patch - - BMC_9319_volume_control_images.patch - - BMC_14815_statusbar_width_for_default_portrait.patch - - BMC_21860_battery_charging_animation.patch - - BMC_19366_System_top_bar_items_are_mis-aligned.patch - - BMC_16893-MR_5.patch - - NEMO_11_remove_profile_from_statusmenu.patch - - NEMO_12_fix_statusmenu_top.patch - - meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch - - Add-shutdown-dialog-to-status-indicator-menu.patch - - systemui-show-Developer-MTP-mode.patch Description: | This package contains the system UI daemon. PkgBR: @@ -84,17 +66,6 @@ - "%{_includedir}/system-ui/*" - "%{_datadir}/qt4/mkspecs/features/system-ui.prf" - - Name: screenlock-padlock - Summary: Screen lock extension for system-ui with a padlock - Group: System/GUI/Other - Description: | - This package contains the screen lock extension for system-ui with a padlock. - Files: - - "%{_libdir}/meegotouch/applicationextensions/libsysuid-screenlock.so" - - "%{_datadir}/meegotouch/applicationextensions/sysuid-screenlock.desktop" - - "%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/*.conf" - - "%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/style/*.css" - - Name: volume-fullscreen Summary: Volume fullscreen extension for system-ui Group: System/GUI/Other ++++++ deleted files: --- Add-shutdown-dialog-to-status-indicator-menu.patch --- BMC_14815_statusbar_width_for_default_portrait.patch --- BMC_14873_reset_dad_on_rotation.patch --- BMC_16893-MR_5.patch --- BMC_17258_Profile_Dialog_replaced_by_settings_profileapplet.patch --- BMC_17553-DE-N900-Notification-cloud-in-notifi.patch --- BMC_19366_System_top_bar_items_are_mis-aligned.patch --- BMC_21860_battery_charging_animation.patch --- BMC_9319_pulseaudio-client.patch --- BMC_9319_volume_control_images.patch --- BMC_9940-No-new-email-notification-is-displayed.patch --- Battery-ChargePercentage-for-battery-capacity.patch --- NEMO_11_remove_profile_from_statusmenu.patch --- NEMO_12_fix_statusmenu_top.patch --- meegotouch-meegotouch-systemui-1.3.2-1.tar.gz --- meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch --- systemui-show-Developer-MTP-mode.patch --- temp_BMC_17585_unlock_device_from_lock_screen.patch
