unity-2d

Merge lp:~fboucault/unity-2d/panel_show_window_buttons_better into lp:unity-2d

  1. panel_show_window_buttons_better
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Gerry Boland
Approved revision: 696
Merged at revision: 699
Proposed branch: lp:~fboucault/unity-2d/panel_show_window_buttons_better
Merge into: lp:unity-2d
Diff against target: 23 lines (+5/-3)
1 file modified
panel/applets/appname/appnameapplet.cpp (+5/-3)
To merge this branch: bzr merge lp:~fboucault/unity-2d/panel_show_window_buttons_better
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+74103@code.launchpad.net

Description of the change

[panel] Show window control buttons whenever the application menu is shown and the window is maximised.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/applets/appname/appnameapplet.cpp'
2--- panel/applets/appname/appnameapplet.cpp 2011-08-22 09:17:03 +0000
3+++ panel/applets/appname/appnameapplet.cpp 2011-09-05 14:00:25 +0000
4@@ -218,14 +218,16 @@
5 bool isUserVisibleApp = app ? app->user_visible() : false;
6 bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));
7 bool isUnderMouse = rect().contains(mapFromGlobal(QCursor::pos()));
8- bool showMenu = (!d->m_menuBarWidget->isEmpty() && isUserVisibleApp && isOnSameScreen)
9- && (isUnderMouse
10+ bool isOpened = isOnSameScreen &&
11+ (isUnderMouse
12 || KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier
13 || d->m_menuBarWidget->isOpened()
14 );
15+ bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
16+ bool showWindowButtons = isOpened && isMaximized;
17 bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
18
19- d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized && isUnderMouse);
20+ d->m_windowButtonWidget->setVisible(showWindowButtons);
21
22 d->m_label->setVisible(showLabel);
23 if (showLabel) {

Subscribers

People subscribed via source and target branches