#include <qmenudata.h>
#endif
-#include "qdebug.h"
#include "qmenu_p.h"
#include "qmenubar_p.h"
-#include "qmenubarimpl_p.h"
+#include "qdebug.h"
#ifdef Q_WS_WINCE
extern bool qt_wince_is_mobile(); //defined in qguifunctions_wce.cpp
*/
QAction *QMenuBarPrivate::actionAt(QPoint p) const
{
- for (int i = 0; i < actions.size(); ++i) {
- if (actionRect(actions.at(i)).contains(p))
+ for(int i = 0; i < actions.size(); ++i) {
+ if(actionRect(actions.at(i)).contains(p))
return actions.at(i);
}
return 0;
void QMenuBarPrivate::updateGeometries()
{
Q_Q(QMenuBar);
- if (!itemsDirty)
+ if(!itemsDirty)
return;
int q_width = q->width()-(q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q)*2);
int q_start = -1;
-
- if (impl->allowCornerWidgets() && (leftWidget || rightWidget)) {
+ if(leftWidget || rightWidget) {
int vmargin = q->style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, q)
+ q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q);
int hmargin = q->style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, q)
}
}
+#ifdef Q_WS_MAC
+ if(q->isNativeMenuBar()) {//nothing to see here folks, move along..
+ itemsDirty = false;
+ return;
+ }
+#endif
+ calcActionRects(q_width, q_start);
+ currentAction = 0;
#ifndef QT_NO_SHORTCUT
- if (!impl->shortcutsHandledByNativeMenuBar() && itemsDirty) {
+ if(itemsDirty) {
for(int j = 0; j < shortcutIndexMap.size(); ++j)
q->releaseShortcut(shortcutIndexMap.value(j));
shortcutIndexMap.resize(0); // faster than clear
shortcutIndexMap.append(q->grabShortcut(QKeySequence::mnemonic(actions.at(i)->text())));
}
#endif
- if (q->isNativeMenuBar()) {//nothing to see here folks, move along..
- itemsDirty = false;
- return;
- }
- calcActionRects(q_width, q_start);
- currentAction = 0;
itemsDirty = false;
hiddenActions.clear();
void QMenuBarPrivate::focusFirstAction()
{
- if (!currentAction) {
+ if(!currentAction) {
updateGeometries();
int index = 0;
while (index < actions.count() && actionRects.at(index).isNull()) ++index;
return;
}
keyboardState = b;
- if (b) {
+ if(b) {
QWidget *fw = QApplication::focusWidget();
if (fw != q)
keyboardFocusWidget = fw;
focusFirstAction();
q->setFocus(Qt::MenuBarFocusReason);
} else {
- if (!popupState)
+ if(!popupState)
setCurrentAction(0);
- if (keyboardFocusWidget) {
+ if(keyboardFocusWidget) {
if (QApplication::focusWidget() == q)
keyboardFocusWidget->setFocus(Qt::MenuBarFocusReason);
keyboardFocusWidget = 0;
void QMenuBarPrivate::popupAction(QAction *action, bool activateFirst)
{
Q_Q(QMenuBar);
- if (!action || !action->menu() || closePopupMode)
+ if(!action || !action->menu() || closePopupMode)
return;
popupState = true;
if (action->isEnabled() && action->menu()->isEnabled()) {
pos.rx() += actionWidth;
}
- if (!defaultPopDown || (fitUp && !fitDown))
+ if(!defaultPopDown || (fitUp && !fitDown))
pos.setY(qMax(screenRect.y(), q->mapToGlobal(QPoint(0, adjustedActionRect.top()-popup_size.height())).y()));
activeMenu->popup(pos);
- if (activateFirst)
+ if(activateFirst)
activeMenu->d_func()->setFirstActionActive();
}
q->update(actionRect(action));
void QMenuBarPrivate::setCurrentAction(QAction *action, bool popup, bool activateFirst)
{
- if (currentAction == action && popup == popupState)
+ if(currentAction == action && popup == popupState)
return;
autoReleaseTimer.stop();
doChildEffects = (popup && !activeMenu);
Q_Q(QMenuBar);
QWidget *fw = 0;
- if (QMenu *menu = activeMenu) {
+ if(QMenu *menu = activeMenu) {
activeMenu = 0;
if (popup) {
fw = q->window()->focusWidget();
menu->hide();
}
- if (currentAction)
+ if(currentAction)
q->update(actionRect(currentAction));
popupState = popup;
currentAction = action;
if (action) {
activateAction(action, QAction::Hover);
- if (popup)
+ if(popup)
popupAction(action, activateFirst);
q->update(actionRect(action));
#ifndef QT_NO_STATUSTIP
{
Q_Q(const QMenuBar);
- if (!itemsDirty)
+ if(!itemsDirty)
return;
//let's reinitialize the buffer
icone = style->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
for(int i = 0; i < actions.count(); i++) {
QAction *action = actions.at(i);
- if (!action->isVisible())
+ if(!action->isVisible())
continue;
QSize sz;
//calc what I think the size is..
- i f(action->isSeparator()) {
+ if(action->isSeparator()) {
if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q))
separator = i;
continue; //we don't really position these!
q->initStyleOption(&opt, action);
sz = q->style()->sizeFromContents(QStyle::CT_MenuBarItem, &opt, sz, q);
- if (!sz.isEmpty()) {
+ if(!sz.isEmpty()) {
{ //update the separator state
int iWidth = sz.width() + itemSpacing;
- if (separator == -1)
+ if(separator == -1)
separator_start += iWidth;
else
separator_len += iWidth;
rect.setHeight(max_item_height);
//move
- if (separator != -1 && i >= separator) { //after the separator
+ if(separator != -1 && i >= separator) { //after the separator
int left = (max_width - separator_len - hmargin - itemSpacing) + (x - separator_start - hmargin);
- if (left < separator_start) { //wrap
+ if(left < separator_start) { //wrap
separator_start = x = hmargin;
y += max_item_height;
}
if (action_e == QAction::Hover)
action->showStatusText(q);
-// if (action_e == QAction::Trigger)
+// if(action_e == QAction::Trigger)
// emit q->activated(action);
-// else if (action_e == QAction::Hover)
+// else if(action_e == QAction::Hover)
// emit q->highlighted(action);
}
Q_Q(QMenuBar);
q->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
q->setAttribute(Qt::WA_CustomWhatsThis);
- impl = new QMenuBarImpl;
- impl->init(q);
-
+#ifdef Q_WS_MAC
+ macCreateMenuBar(q->parentWidget());
+ if(mac_menubar)
+ q->hide();
+#endif
+#ifdef Q_WS_WINCE
+ if (qt_wince_is_mobile()) {
+ wceCreateMenuBar(q->parentWidget());
+ if(wce_menubar)
+ q->hide();
+ }
+ else {
+ QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
+ }
+#endif
q->setBackgroundRole(QPalette::Button);
oldWindow = oldParent = 0;
#ifdef QT3_SUPPORT
#ifdef QT_SOFTKEYS_ENABLED
menuBarAction = 0;
#endif
- cornerWidgetToolBar = 0;
- cornerWidgetContainer = 0;
-
handleReparent();
q->setMouseTracking(q->style()->styleHint(QStyle::SH_MenuBar_MouseTracking, 0, q));
*/
QMenuBar::~QMenuBar()
{
+#ifdef Q_WS_MAC
+ Q_D(QMenuBar);
+ d->macDestroyMenuBar();
+#endif
+#ifdef Q_WS_WINCE
+ Q_D(QMenuBar);
+ if (qt_wince_is_mobile())
+ d->wceDestroyMenuBar();
+#endif
+#ifdef Q_WS_S60
Q_D(QMenuBar);
- delete d->cornerWidgetToolBar;
+ d->symbianDestroyMenuBar();
+#endif
}
/*!
QRect adjustedActionRect = d->actionRect(action);
if (adjustedActionRect.isEmpty() || !d->isVisible(action))
continue;
- if (!e->rect().intersects(adjustedActionRect))
+ if(!e->rect().intersects(adjustedActionRect))
continue;
emptyArea -= adjustedActionRect;
style()->drawControl(QStyle::CE_MenuBarItem, &opt, &p, this);
}
//draw border
- if (int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this)) {
+ if(int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this)) {
QRegion borderReg;
borderReg += QRect(0, 0, fw, height()); //left
borderReg += QRect(width()-fw, 0, fw, height()); //right
*/
void QMenuBar::setVisible(bool visible)
{
- Q_D(QMenuBar);
- if (!d->impl->allowSetVisible()) {
+#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
+ if (isNativeMenuBar()) {
+ if (!visible)
+ QWidget::setVisible(false);
return;
}
+#endif
QWidget::setVisible(visible);
}
void QMenuBar::mousePressEvent(QMouseEvent *e)
{
Q_D(QMenuBar);
- if (e->button() != Qt::LeftButton)
+ if(e->button() != Qt::LeftButton)
return;
d->mouseDown = true;
return;
}
- if (d->currentAction == action && d->popupState) {
- if (QMenu *menu = d->activeMenu) {
+ if(d->currentAction == action && d->popupState) {
+ if(QMenu *menu = d->activeMenu) {
d->activeMenu = 0;
menu->hide();
}
#ifdef Q_WS_WIN
- if ((d->closePopupMode = style()->styleHint(QStyle::SH_MenuBar_DismissOnSecondClick)))
+ if((d->closePopupMode = style()->styleHint(QStyle::SH_MenuBar_DismissOnSecondClick)))
update(d->actionRect(action));
#endif
} else {
void QMenuBar::mouseReleaseEvent(QMouseEvent *e)
{
Q_D(QMenuBar);
- if (e->button() != Qt::LeftButton || !d->mouseDown)
+ if(e->button() != Qt::LeftButton || !d->mouseDown)
return;
d->mouseDown = false;
QAction *action = d->actionAt(e->pos());
- if ((d->closePopupMode && action == d->currentAction) || !action || !action->menu()) {
+ if((d->closePopupMode && action == d->currentAction) || !action || !action->menu()) {
//we set the current action before activating
//so that we let the leave event set the current back to 0
d->setCurrentAction(action, false);
- if (action)
+ if(action)
d->activateAction(action, QAction::Trigger);
}
d->closePopupMode = 0;
Q_D(QMenuBar);
d->updateGeometries();
int key = e->key();
- if (isRightToLeft()) { // in reverse mode open/close key for submenues are reversed
- if (key == Qt::Key_Left)
+ if(isRightToLeft()) { // in reverse mode open/close key for submenues are reversed
+ if(key == Qt::Key_Left)
key = Qt::Key_Right;
- else if (key == Qt::Key_Right)
+ else if(key == Qt::Key_Right)
key = Qt::Key_Left;
}
- if (key == Qt::Key_Tab) //means right
+ if(key == Qt::Key_Tab) //means right
key = Qt::Key_Right;
- else if (key == Qt::Key_Backtab) //means left
+ else if(key == Qt::Key_Backtab) //means left
key = Qt::Key_Left;
bool key_consumed = false;
case Qt::Key_Enter:
case Qt::Key_Space:
case Qt::Key_Return: {
- if (!style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, this) || !d->currentAction)
+ if(!style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, this) || !d->currentAction)
break;
- if (d->currentAction->menu()) {
+ if(d->currentAction->menu()) {
d->popupAction(d->currentAction, true);
- } else if (key == Qt::Key_Enter || key == Qt::Key_Return || key == Qt::Key_Space) {
+ } else if(key == Qt::Key_Enter || key == Qt::Key_Return || key == Qt::Key_Space) {
d->activateAction(d->currentAction, QAction::Trigger);
d->setCurrentAction(d->currentAction, false);
d->setKeyboardMode(false);
case Qt::Key_Right:
case Qt::Key_Left: {
- if (d->currentAction) {
+ if(d->currentAction) {
int index = d->actions.indexOf(d->currentAction);
if (QAction *nextAction = d->getNextAction(index, key == Qt::Key_Left ? -1 : +1)) {
d->setCurrentAction(nextAction, d->popupState, true);
key_consumed = false;
}
- if (!key_consumed &&
+ if(!key_consumed &&
(!e->modifiers() ||
(e->modifiers()&(Qt::MetaModifier|Qt::AltModifier))) && e->text().length()==1 && !d->popupState) {
int clashCount = 0;
continue;
QAction *act = d->actions.at(i);
QString s = act->text();
- if (!s.isEmpty()) {
+ if(!s.isEmpty()) {
int ampersand = s.indexOf(QLatin1Char('&'));
- if (ampersand >= 0) {
- if (s[ampersand+1].toUpper() == c) {
+ if(ampersand >= 0) {
+ if(s[ampersand+1].toUpper() == c) {
clashCount++;
- if (!first)
+ if(!first)
first = act;
- if (act == d->currentAction)
+ if(act == d->currentAction)
currentSelected = act;
else if (!firstAfterCurrent && currentSelected)
firstAfterCurrent = act;
}
}
QAction *next_action = 0;
- if (clashCount >= 1) {
- if (clashCount == 1 || !d->currentAction || (currentSelected && !firstAfterCurrent))
+ if(clashCount >= 1) {
+ if(clashCount == 1 || !d->currentAction || (currentSelected && !firstAfterCurrent))
next_action = first;
else
next_action = firstAfterCurrent;
}
- if (next_action) {
+ if(next_action) {
key_consumed = true;
d->setCurrentAction(next_action, true, true);
}
}
- if (key_consumed)
+ if(key_consumed)
e->accept();
else
e->ignore();
void QMenuBar::leaveEvent(QEvent *)
{
Q_D(QMenuBar);
- if ((!hasFocus() && !d->popupState) ||
+ if((!hasFocus() && !d->popupState) ||
(d->currentAction && d->currentAction->menu() == 0))
d->setCurrentAction(0);
}
{
Q_D(QMenuBar);
d->itemsDirty = true;
- d->impl->actionEvent(e);
+#if defined (Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
+ if (isNativeMenuBar()) {
+#ifdef Q_WS_MAC
+ QMenuBarPrivate::QMacMenuBarPrivate *nativeMenuBar = d->mac_menubar;
+#elif defined(Q_WS_S60)
+ QMenuBarPrivate::QSymbianMenuBarPrivate *nativeMenuBar = d->symbian_menubar;
+#else
+ QMenuBarPrivate::QWceMenuBarPrivate *nativeMenuBar = d->wce_menubar;
+#endif
+ if (!nativeMenuBar)
+ return;
+ if(e->type() == QEvent::ActionAdded)
+ nativeMenuBar->addAction(e->action(), nativeMenuBar->findAction(e->before()));
+ else if(e->type() == QEvent::ActionRemoved)
+ nativeMenuBar->removeAction(e->action());
+ else if(e->type() == QEvent::ActionChanged)
+ nativeMenuBar->syncAction(e->action());
+ }
+#endif
- if (e->type() == QEvent::ActionAdded) {
+ if(e->type() == QEvent::ActionAdded) {
connect(e->action(), SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
connect(e->action(), SIGNAL(hovered()), this, SLOT(_q_actionHovered()));
- } else if (e->type() == QEvent::ActionRemoved) {
+ } else if(e->type() == QEvent::ActionRemoved) {
e->action()->disconnect(this);
}
if (isVisible()) {
void QMenuBar::focusInEvent(QFocusEvent *)
{
Q_D(QMenuBar);
- if (d->keyboardState)
+ if(d->keyboardState)
d->focusFirstAction();
}
void QMenuBar::focusOutEvent(QFocusEvent *)
{
Q_D(QMenuBar);
- if (!d->popupState) {
+ if(!d->popupState) {
d->setCurrentAction(0);
d->setKeyboardMode(false);
}
newWindow->installEventFilter(q);
}
- impl->handleReparent(oldParent, newParent, oldWindow, newWindow);
-
oldParent = newParent;
oldWindow = newWindow;
+
+#ifdef Q_WS_MAC
+ if (q->isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) {
+ // If the new parent got a native menubar from before, keep that
+ // menubar rather than replace it with this one (because a parents
+ // menubar has precedence over children menubars).
+ macDestroyMenuBar();
+ macCreateMenuBar(newParent);
+ }
+#endif
+
+#ifdef Q_WS_WINCE
+ if (qt_wince_is_mobile() && wce_menubar)
+ wce_menubar->rebuild();
+#endif
+#ifdef Q_WS_S60
+
+ // Construct symbian_menubar when this code path is entered first time
+ // and when newParent != NULL
+ if (!symbian_menubar)
+ symbianCreateMenuBar(newParent);
+
+ // Reparent and rebuild menubar when parent is changed
+ if (symbian_menubar) {
+ if (oldParent != newParent)
+ reparentMenuBar(oldParent, newParent);
+ q->hide();
+ symbian_menubar->rebuild();
+ }
+
+#ifdef QT_SOFTKEYS_ENABLED
+ // Constuct menuBarAction when this code path is entered first time
+ if (!menuBarAction) {
+ if (newParent) {
+ menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, newParent);
+ newParent->addAction(menuBarAction);
+ }
+ } else {
+ // If reparenting i.e. we already have menuBarAction, remove it from old parent
+ // and add for a new parent
+ if (oldParent)
+ oldParent->removeAction(menuBarAction);
+ if (newParent)
+ newParent->addAction(menuBarAction);
+ }
+#endif // QT_SOFTKEYS_ENABLED
+#endif // Q_WS_S60
}
#ifdef QT3_SUPPORT
void QMenuBar::changeEvent(QEvent *e)
{
Q_D(QMenuBar);
- if (e->type() == QEvent::StyleChange) {
+ if(e->type() == QEvent::StyleChange) {
d->itemsDirty = true;
setMouseTracking(style()->styleHint(QStyle::SH_MenuBar_MouseTracking, 0, this));
- if (parentWidget())
+ if(parentWidget())
resize(parentWidget()->width(), heightForWidth(parentWidget()->width()));
d->updateGeometries();
} else if (e->type() == QEvent::ParentChange) {
case QEvent::KeyPress: {
QKeyEvent *ke = (QKeyEvent*)e;
#if 0
- if (!d->keyboardState) { //all keypresses..
+ if(!d->keyboardState) { //all keypresses..
d->setCurrentAction(0);
return ;
}
#endif
- if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) {
+ if(ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) {
keyPressEvent(ke);
return true;
}
#endif
case QEvent::Show:
#ifdef QT3_SUPPORT
- if (QWidget *p = parentWidget()) {
+ if(QWidget *p = parentWidget()) {
// If itemsDirty == true, updateGeometries sends the MenubarUpdated event.
if (!d->itemsDirty) {
QMenubarUpdatedEvent menubarUpdated(this);
#ifdef QT3_SUPPORT
case QEvent::Hide: {
- if (QWidget *p = parentWidget()) {
+ if(QWidget *p = parentWidget()) {
QMenubarUpdatedEvent menubarUpdated(this);
QApplication::sendEvent(p, &menubarUpdated);
}
bool QMenuBar::eventFilter(QObject *object, QEvent *event)
{
Q_D(QMenuBar);
- if (d->impl->menuBarEventFilter(object, event)) {
- return true;
- }
if (object == parent() && object) {
#ifdef QT3_SUPPORT
if (d->doAutoResize && event->type() == QEvent::Resize) {
QSize QMenuBar::minimumSizeHint() const
{
Q_D(const QMenuBar);
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
const bool as_gui_menubar = !isNativeMenuBar();
+#else
+ const bool as_gui_menubar = true;
+#endif
ensurePolished();
QSize ret(0, 0);
const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this);
int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
- if (as_gui_menubar) {
+ if(as_gui_menubar) {
int w = parentWidget() ? parentWidget()->width() : QApplication::desktop()->width();
d->calcActionRects(w - (2 * fw), 0);
for (int i = 0; ret.isNull() && i < d->actions.count(); ++i)
ret += QSize(2*fw + hmargin, 2*fw + vmargin);
}
int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
- if (d->impl->allowCornerWidgets()) {
- if (d->leftWidget) {
- QSize sz = d->leftWidget->minimumSizeHint();
- ret.setWidth(ret.width() + sz.width());
- if (sz.height() + margin > ret.height())
- ret.setHeight(sz.height() + margin);
- }
- if (d->rightWidget) {
- QSize sz = d->rightWidget->minimumSizeHint();
- ret.setWidth(ret.width() + sz.width());
- if (sz.height() + margin > ret.height())
- ret.setHeight(sz.height() + margin);
- }
- }
- if (as_gui_menubar) {
+ if(d->leftWidget) {
+ QSize sz = d->leftWidget->minimumSizeHint();
+ ret.setWidth(ret.width() + sz.width());
+ if(sz.height() + margin > ret.height())
+ ret.setHeight(sz.height() + margin);
+ }
+ if(d->rightWidget) {
+ QSize sz = d->rightWidget->minimumSizeHint();
+ ret.setWidth(ret.width() + sz.width());
+ if(sz.height() + margin > ret.height())
+ ret.setHeight(sz.height() + margin);
+ }
+ if(as_gui_menubar) {
QStyleOptionMenuItem opt;
opt.rect = rect();
opt.menuRect = rect();
QSize QMenuBar::sizeHint() const
{
Q_D(const QMenuBar);
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
const bool as_gui_menubar = !isNativeMenuBar();
+#else
+ const bool as_gui_menubar = true;
+#endif
+
ensurePolished();
QSize ret(0, 0);
const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this);
int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
- if (as_gui_menubar) {
+ if(as_gui_menubar) {
const int w = parentWidget() ? parentWidget()->width() : QApplication::desktop()->width();
d->calcActionRects(w - (2 * fw), 0);
for (int i = 0; i < d->actionRects.count(); ++i) {
ret += QSize(fw + hmargin, fw + vmargin);
}
int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
- if (d->impl->allowCornerWidgets()) {
- if (d->leftWidget) {
- QSize sz = d->leftWidget->sizeHint();
- ret.setWidth(ret.width() + sz.width());
- if (sz.height() + margin > ret.height())
- ret.setHeight(sz.height() + margin);
- }
- if (d->rightWidget) {
- QSize sz = d->rightWidget->sizeHint();
- ret.setWidth(ret.width() + sz.width());
- if (sz.height() + margin > ret.height())
- ret.setHeight(sz.height() + margin);
- }
- }
- if (as_gui_menubar) {
+ if(d->leftWidget) {
+ QSize sz = d->leftWidget->sizeHint();
+ ret.setWidth(ret.width() + sz.width());
+ if(sz.height() + margin > ret.height())
+ ret.setHeight(sz.height() + margin);
+ }
+ if(d->rightWidget) {
+ QSize sz = d->rightWidget->sizeHint();
+ ret.setWidth(ret.width() + sz.width());
+ if(sz.height() + margin > ret.height())
+ ret.setHeight(sz.height() + margin);
+ }
+ if(as_gui_menubar) {
QStyleOptionMenuItem opt;
opt.rect = rect();
opt.menuRect = rect();
int QMenuBar::heightForWidth(int) const
{
Q_D(const QMenuBar);
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
const bool as_gui_menubar = !isNativeMenuBar();
+#else
+ const bool as_gui_menubar = true;
+#endif
const_cast<QMenuBarPrivate*>(d)->updateGeometries();
int height = 0;
const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this);
int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
- if (as_gui_menubar) {
+ if(as_gui_menubar) {
for (int i = 0; i < d->actionRects.count(); ++i)
height = qMax(height, d->actionRects.at(i).height());
if (height) //there is at least one non-null item
height += 2*vmargin;
}
int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
- if (d->impl->allowCornerWidgets()) {
- if (d->leftWidget)
- height = qMax(d->leftWidget->sizeHint().height() + margin, height);
- if (d->rightWidget)
- height = qMax(d->rightWidget->sizeHint().height() + margin, height);
- }
- if (as_gui_menubar) {
+ if(d->leftWidget)
+ height = qMax(d->leftWidget->sizeHint().height() + margin, height);
+ if(d->rightWidget)
+ height = qMax(d->rightWidget->sizeHint().height() + margin, height);
+ if(as_gui_menubar) {
QStyleOptionMenuItem opt;
opt.init(this);
opt.menuRect = rect();
{
Q_Q(QMenuBar);
QAction *act = actions.at(id);
- if (q->isNativeMenuBar()) {
- impl->popupAction(act);
- } else {
- setCurrentAction(act, true, true);
- }
+ setCurrentAction(act, true, true);
if (act && !act->menu()) {
activateAction(act, QAction::Trigger);
//100 is the same as the default value in QPushButton::animateClick
}
}
-void QMenuBarPrivate::updateCornerWidgetToolBar()
-{
- Q_Q(QMenuBar);
- if (!cornerWidgetToolBar) {
- QMainWindow *window = qobject_cast<QMainWindow *>(q->window());
- if (!window) {
- qWarning() << "Menubar parent is not a QMainWindow, not showing corner widgets";
- return;
- }
- cornerWidgetToolBar = window->addToolBar(QApplication::translate("QMenuBar", "Corner Toolbar"));
- cornerWidgetToolBar->setObjectName(QLatin1String("CornerToolBar"));
- cornerWidgetContainer = new QWidget;
- cornerWidgetToolBar->addWidget(cornerWidgetContainer);
- new QHBoxLayout(cornerWidgetContainer);
- } else {
- QLayout *layout = cornerWidgetContainer->layout();
- while (layout->count() > 0) {
- layout->takeAt(0);
- }
- }
- if (leftWidget) {
- leftWidget->setParent(cornerWidgetContainer);
- cornerWidgetContainer->layout()->addWidget(leftWidget);
- }
- if (rightWidget) {
- rightWidget->setParent(cornerWidgetContainer);
- cornerWidgetContainer->layout()->addWidget(rightWidget);
- }
-}
-
-
/*!
\fn void QMenuBar::setCornerWidget(QWidget *widget, Qt::Corner corner)
return;
}
- if (!d->impl->allowCornerWidgets()) {
- d->updateCornerWidgetToolBar();
- } else if (w) {
+ if (w) {
w->setParent(this);
w->installEventFilter(this);
}
void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
{
Q_D(QMenuBar);
- d->impl->setNativeMenuBar(nativeMenuBar);
+ if (d->nativeMenuBar == -1 || (nativeMenuBar != bool(d->nativeMenuBar))) {
+ d->nativeMenuBar = nativeMenuBar;
+#ifdef Q_WS_MAC
+ if (!d->nativeMenuBar) {
+ extern void qt_mac_clear_menubar();
+ qt_mac_clear_menubar();
+ d->macDestroyMenuBar();
+ const QList<QAction *> &menubarActions = actions();
+ for (int i = 0; i < menubarActions.size(); ++i) {
+ const QAction *action = menubarActions.at(i);
+ if (QMenu *menu = action->menu()) {
+ delete menu->d_func()->mac_menu;
+ menu->d_func()->mac_menu = 0;
+ }
+ }
+ } else {
+ d->macCreateMenuBar(parentWidget());
+ }
+ macUpdateMenuBar();
+ updateGeometry();
+ if (!d->nativeMenuBar && parentWidget())
+ setVisible(true);
+#endif
+ }
}
bool QMenuBar::isNativeMenuBar() const
{
Q_D(const QMenuBar);
- return d->impl->isNativeMenuBar();
+ if (d->nativeMenuBar == -1) {
+ return !QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar);
+ }
+ return d->nativeMenuBar;
}
/*!
connect(d->defaultAction, SIGNAL(changed()), this, SLOT(_q_updateDefaultAction()));
connect(d->defaultAction, SIGNAL(destroyed()), this, SLOT(_q_updateDefaultAction()));
}
- if (d->impl->nativeMenuBarAdapter()) {
- d->impl->nativeMenuBarAdapter()->rebuild();
+ if (d->wce_menubar) {
+ d->wce_menubar->rebuild();
}
#endif
}
const QKeySequence *shortcut, const QMenu *popup, int id, int index)
{
QAction *act = popup ? popup->menuAction() : new QAction(this);
- if (id != -1)
+ if(id != -1)
static_cast<QMenuItem*>(act)->setId(id);
- if (icon)
+ if(icon)
act->setIcon(*icon);
- if (text)
+ if(text)
act->setText(*text);
- if (shortcut)
+ if(shortcut)
act->setShortcut(*shortcut);
- if (receiver && member)
+ if(receiver && member)
QObject::connect(act, SIGNAL(triggered(bool)), receiver, member);
- if (index == -1 || index >= actions().count())
+ if(index == -1 || index >= actions().count())
addAction(act);
else
insertAction(actions().value(index), act);
{
QAction *act = new QAction(this);
act->setSeparator(true);
- if (index == -1 || index >= actions().count())
+ if(index == -1 || index >= actions().count())
addAction(act);
else
insertAction(actions().value(index), act);
*/
bool QMenuBar::setItemParameter(int id, int param)
{
- if (QAction *act = findActionForId(id)) {
+ if(QAction *act = findActionForId(id)) {
act->d_func()->param = param;
return true;
}
*/
int QMenuBar::itemParameter(int id) const
{
- if (QAction *act = findActionForId(id))
+ if(QAction *act = findActionForId(id))
return act->d_func()->param;
return id;
}
+++ /dev/null
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used 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. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmenubarimpl_p.h"
-
-#ifndef QT_NO_MENUBAR
-
-#include "qapplication.h"
-#include "qdebug.h"
-#include "qevent.h"
-#include "qmenu.h"
-#include "qmenubar.h"
-
-QT_BEGIN_NAMESPACE
-
-QMenuBarImpl::~QMenuBarImpl()
-{
-#ifdef Q_WS_MAC
- macDestroyMenuBar();
-#endif
-#ifdef Q_WS_WINCE
- if (qt_wince_is_mobile())
- wceDestroyMenuBar();
-#endif
-#ifdef Q_WS_S60
- symbianDestroyMenuBar();
-#endif
-}
-
-void QMenuBarImpl::init(QMenuBar *_menuBar)
-{
- nativeMenuBar = -1;
- menuBar = _menuBar;
-#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
- adapter = 0;
-#endif
-#ifdef Q_WS_MAC
- macCreateMenuBar(menuBar->parentWidget());
- if (adapter)
- menuBar->hide();
-#endif
-#ifdef Q_WS_WINCE
- if (qt_wince_is_mobile()) {
- wceCreateMenuBar(menuBar->parentWidget());
- if (adapter)
- menuBar->hide();
- } else {
- QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
- }
-#endif
-}
-
-bool QMenuBarImpl::allowSetVisible() const
-{
-#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
- // FIXME: Port this to a setVisible() method
- /*
- if (isNativeMenuBar()) {
- if (!visible)
- QWidget::setVisible(false);
- return;
- }
- */
- return !isNativeMenuBar();
-#endif
- return true;
-}
-
-void QMenuBarImpl::actionEvent(QActionEvent *e)
-{
-#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
- if (adapter) {
- if (e->type() == QEvent::ActionAdded)
- adapter->addAction(e->action(), e->before());
- else if (e->type() == QEvent::ActionRemoved)
- adapter->removeAction(e->action());
- else if (e->type() == QEvent::ActionChanged)
- adapter->syncAction(e->action());
- }
-#else
- Q_UNUSED(e);
-#endif
-}
-
-void QMenuBarImpl::handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow)
-{
-#ifdef Q_WS_X11
- Q_UNUSED(oldParent)
- Q_UNUSED(newParent)
- Q_UNUSED(oldWindow)
- Q_UNUSED(newWindow)
-#endif
-
-#ifdef Q_WS_MAC
- if (isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) {
- // If the new parent got a native menubar from before, keep that
- // menubar rather than replace it with this one (because a parents
- // menubar has precedence over children menubars).
- macDestroyMenuBar();
- macCreateMenuBar(newParent);
- }
-#endif
-#ifdef Q_WS_WINCE
- if (qt_wince_is_mobile() && nativeMenuBarAdapter())
- adapter->rebuild();
-#endif
-#ifdef Q_WS_S60
-
- // Construct d->impl->nativeMenuBarAdapter() when this code path is entered first time
- // and when newParent != NULL
- if (!adapter)
- symbianCreateMenuBar(newParent);
-
- // Reparent and rebuild menubar when parent is changed
- if (adapter) {
- if (oldParent != newParent)
- reparentMenuBar(oldParent, newParent);
- menuBar->hide();
- adapter->rebuild();
- }
-
-#ifdef QT_SOFTKEYS_ENABLED
- // Constuct menuBarAction when this code path is entered first time
- if (!menuBarAction) {
- if (newParent) {
- menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, newParent);
- newParent->addAction(menuBarAction);
- }
- } else {
- // If reparenting i.e. we already have menuBarAction, remove it from old parent
- // and add for a new parent
- if (oldParent)
- oldParent->removeAction(menuBarAction);
- if (newParent)
- newParent->addAction(menuBarAction);
- }
-#endif // QT_SOFTKEYS_ENABLED
-#endif // Q_WS_S60
-}
-
-bool QMenuBarImpl::allowCornerWidgets() const
-{
- return true;
-}
-
-void QMenuBarImpl::popupAction(QAction *)
-{
-}
-
-void QMenuBarImpl::setNativeMenuBar(bool value)
-{
- if (nativeMenuBar == -1 || (value != bool(nativeMenuBar))) {
- nativeMenuBar = value;
-#ifdef Q_WS_MAC
- if (!nativeMenuBar) {
- extern void qt_mac_clear_menubar();
- qt_mac_clear_menubar();
- macDestroyMenuBar();
- const QList<QAction *> &menubarActions = actions();
- for (int i = 0; i < menubarActions.size(); ++i) {
- const QAction *action = menubarActions.at(i);
- if (QMenu *menu = action->menu()) {
- delete menu->d_func()->mac_menu;
- menu->d_func()->mac_menu = 0;
- }
- }
- } else {
- macCreateMenuBar(parentWidget());
- }
- macUpdateMenuBar();
- updateGeometry();
- if (!nativeMenuBar && parentWidget())
- setVisible(true);
-#endif
- }
-}
-
-bool QMenuBarImpl::isNativeMenuBar() const
-{
-#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
- if (nativeMenuBar == -1) {
- return !QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar);
- }
- return nativeMenuBar;
-#else
- return false;
-#endif
-}
-
-bool QMenuBarImpl::shortcutsHandledByNativeMenuBar() const
-{
-#ifdef Q_WS_MAC
- return true;
-#else
- return false;
-#endif
-}
-
-bool QMenuBarImpl::menuBarEventFilter(QObject *, QEvent *)
-{
- return false;
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_MENUBAR
+++ /dev/null
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used 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. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMENUBARIMPL_P_H
-#define QMENUBARIMPL_P_H
-
-#ifndef QT_NO_MENUBAR
-
-#include "qabstractmenubarimpl_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QMenuBar;
-
-class QMenuBarImpl : public QAbstractMenuBarImpl
-{
-public:
- ~QMenuBarImpl();
-
- virtual void init(QMenuBar *);
-
- virtual bool allowSetVisible() const;
-
- virtual void actionEvent(QActionEvent *e);
-
- virtual void handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow);
-
- virtual bool allowCornerWidgets() const;
-
- virtual void popupAction(QAction*);
-
- virtual void setNativeMenuBar(bool);
- virtual bool isNativeMenuBar() const;
-
- virtual bool shortcutsHandledByNativeMenuBar() const;
- virtual bool menuBarEventFilter(QObject *, QEvent *event);
-
-private:
- QMenuBar *menuBar;
- int nativeMenuBar : 3; // Only has values -1, 0, and 1
-
-#ifdef Q_WS_MAC
- //mac menubar binding
- struct QMacMenuBarPrivate {
- QList<QMacMenuAction*> actionItems;
- OSMenuRef menu, apple_menu;
- QMacMenuBarPrivate();
- ~QMacMenuBarPrivate();
-
- void addAction(QAction *, QAction* =0);
- void addAction(QMacMenuAction *, QMacMenuAction* =0);
- void syncAction(QMacMenuAction *);
- inline void syncAction(QAction *a) { syncAction(findAction(a)); }
- void removeAction(QMacMenuAction *);
- inline void removeAction(QAction *a) { removeAction(findAction(a)); }
- inline QMacMenuAction *findAction(QAction *a) {
- for (int i = 0; i < actionItems.size(); i++) {
- QMacMenuAction *act = actionItems[i];
- if (a == act->action)
- return act;
- }
- return 0;
- }
- } adapter;
- static bool macUpdateMenuBarImmediatly();
- bool macWidgetHasNativeMenubar(QWidget *widget);
- void macCreateMenuBar(QWidget *);
- void macDestroyMenuBar();
- OSMenuRef macMenu();
-#endif
-#ifdef Q_WS_WINCE
- void wceCreateMenuBar(QWidget *);
- void wceDestroyMenuBar();
- struct QWceMenuBarPrivate {
- QList<QWceMenuAction*> actionItems;
- QList<QWceMenuAction*> actionItemsLeftButton;
- QList<QList<QWceMenuAction*>> actionItemsClassic;
- HMENU menuHandle;
- HMENU leftButtonMenuHandle;
- HWND menubarHandle;
- HWND parentWindowHandle;
- bool leftButtonIsMenu;
- QPointer<QAction> leftButtonAction;
- QMenuBarPrivate *d;
- int leftButtonCommand;
-
- QWceMenuBarPrivate(QMenuBarPrivate *menubar);
- ~QWceMenuBarPrivate();
- void addAction(QAction *, QAction* =0);
- void addAction(QWceMenuAction *, QWceMenuAction* =0);
- void syncAction(QWceMenuAction *);
- inline void syncAction(QAction *a) { syncAction(findAction(a)); }
- void removeAction(QWceMenuAction *);
- void rebuild();
- inline void removeAction(QAction *a) { removeAction(findAction(a)); }
- inline QWceMenuAction *findAction(QAction *a) {
- for (int i = 0; i < actionItems.size(); i++) {
- QWceMenuAction *act = actionItems[i];
- if (a == act->action)
- return act;
- }
- return 0;
- }
- } adapter;
- bool wceClassicMenu;
- void wceCommands(uint command);
- void wceRefresh();
- bool wceEmitSignals(QList<QWceMenuAction*> actions, uint command);
-#endif
-#ifdef Q_WS_S60
- void symbianCreateMenuBar(QWidget *);
- void symbianDestroyMenuBar();
- void reparentMenuBar(QWidget *oldParent, QWidget *newParent);
- struct QSymbianMenuBarPrivate {
- QList<QSymbianMenuAction*> actionItems;
- QMenuBarPrivate *d;
- QSymbianMenuBarPrivate(QMenuBarPrivate *menubar);
- ~QSymbianMenuBarPrivate();
- void addAction(QAction *, QAction* =0);
- void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
- void syncAction(QSymbianMenuAction *);
- inline void syncAction(QAction *a) { syncAction(findAction(a)); }
- void removeAction(QSymbianMenuAction *);
- void rebuild();
- inline void removeAction(QAction *a) { removeAction(findAction(a)); }
- inline QSymbianMenuAction *findAction(QAction *a) {
- for (int i = 0; i < actionItems.size(); i++) {
- QSymbianMenuAction *act = actionItems[i];
- if (a == act->action)
- return act;
- }
- return 0;
- }
- void insertNativeMenuItems(const QList<QAction*> &actions);
-
- } adapter;
- static int symbianCommands(int command);
-#endif
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_MENUBAR
-
-#endif /* QMENUBARIMPL_P_H */
projects / profile / ivi / qtbase.git / commitdiff