~fboucault/unity-2d/a11y_lens_navigation

~fboucault/unity-2d/a11y_lens_navigation_bar

« back to all changes in this revision

Viewing changes to panel/applets/appname/appnameapplet.cpp

Committer: Tarmac
Author(s): Florian Boucault
Date: 2011-09-05 15:34:36 UTC
mfrom: (695.2.1 panel_show_window_buttons_better)
Revision ID: tarmac-20110905153436-roqkx7a2gxv3tpdg

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

files modified:
panel/applets/appname/appnameapplet.cpp

Show diffs side-by-side

added added

removed removed

panel/applets/appname/appnameapplet.cpp

218

bool isUserVisibleApp = app ? app->user_visible() : false;

219

bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));

220

bool isUnderMouse = rect().contains(mapFromGlobal(QCursor::pos()));

221

bool showMenu = (!d->m_menuBarWidget->isEmpty() && isUserVisibleApp && isOnSameScreen)

222

&& (isUnderMouse

221

bool isOpened = isOnSameScreen &&

222

(isUnderMouse

223

|| KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier

224

|| d->m_menuBarWidget->isOpened()

225

);

226

bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;

227

bool showWindowButtons = isOpened && isMaximized;

226

228

bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;

227

229

228

d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized && isUnderMouse);

230

d->m_windowButtonWidget->setVisible(showWindowButtons);

229

231

230

232

d->m_label->setVisible(showLabel);

231

233

if (showLabel) {

Older »