FCL/sf/mw/hb: comparison src/hbcore/gui/hbtoolbutton.cpp

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include "hbaction_p.h"
 #include <hbglobal.h>
 #include "hbcolorscheme.h"
 #include "hbtextitem.h"
 #include "hbiconitem.h"
+#include "hbview.h"
+#include "hbmainwindow.h"
+#include "hbglobal_p.h" // remove when removing HB_DEPRECATED
 #include <QGraphicsSceneHelpEvent>
 #include <QGraphicsSceneMouseEvent>
 /*!
 \sa HbAction, HbPushButton
 */
 /*!
 \enum HbToolButton::ToolButtonStyle
+\deprecated HbToolButton::ToolButtonStyle
 This enum defines available tool button styles.
 The tool button style describes how the button's text and icon should be displayed.
 */
 /*!
 \var HbToolButton::ToolButtonIcon
+\deprecated HbToolButton::ToolButtonIcon
 Only display the icon.
 */
 /*!
 \var HbToolButton::ToolButtonText
+\deprecated HbToolButton::ToolButtonText
 Only display the text.
 */
 /*!
 \var HbToolButton::ToolButtonTextAndIcon
+\deprecated HbToolButton::ToolButtonTextAndIcon
 Display both text and icon.
 */
 /*!
 backgroundVisible(true),
 buttonStyle(HbToolButton::ToolButtonIcon),
 toolBarPosition(HbStyleOptionToolButton::TB_None),
 orientation(Qt::Vertical),
 mDialogToolBar(false),
+toolbarExtensionFrame(false),
 mButtonSize(QSizeF())
 {
 }
 HbToolButtonPrivate::~HbToolButtonPrivate()
 }
 void HbToolButtonPrivate::createPrimitives()
 {
 Q_Q(HbToolButton);
 if (backgroundVisible) {
-if (!frameItem) {
+if (!frameItem){
 frameItem = q->style()->createPrimitive(HbStyle::P_ToolButton_frame, q);
 }
 } else if (frameItem) {
 delete frameItem;
 frameItem = 0;
 // to work for all cases
 if (q->isVisible() && polished) {
 q->updatePrimitives();
 }
 }
+}
+void HbToolButtonPrivate::setExtensionBackgroundVisible(bool visible)
+{
+Q_Q(HbToolButton);
+if (toolbarExtensionFrame != visible) {
+toolbarExtensionFrame = visible;
+// required to make extension orientation switch from
+// landscape to portrait work correctly with automatic more
+// extension.
+q->repolish();
+}
 }
 void HbToolButtonPrivate::setBackgroundVisible(bool visible)
 {
 Q_Q(HbToolButton);
 }
 } else {
 buttonStyle = HbToolButton::ToolButtonText;
 }
 // action text/icon may have changed,
-if (q->isVisible() && polished) {
+if (polished) {
 q->repolish();
 }
 }
 void HbToolButtonPrivate::showToolTip()
 updatePrimitives();
 }
 }
 /*!
+\deprecated HbToolButton::toolButtonStyle() const
+is deprecated.
 @beta
 Returns the tool button style.
 The default value is \b HbToolButton::ToolButtonIcon.
 \sa setToolButtonStyle()
 */
 HbToolButton::ToolButtonStyle HbToolButton::toolButtonStyle() const
 {
+HB_DEPRECATED("HbToolButton::toolButtonStyle() is deprecated.");
 Q_D(const HbToolButton);
 return d->buttonStyle;
 }
 /*!
+\deprecated HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle)
+is deprecated.
 @beta
 Sets the tool button style.
 \sa toolButtonStyle()
 */
 void HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle style)
 {
+HB_DEPRECATED("HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle style) is deprecated.");
 Q_D(HbToolButton);
 if (d->buttonStyle != style) {
 d->buttonStyle = style;
 // action text/icon may have changed,
 }
 }
 }
 /*!
+\deprecated HbToolButton::primitive(HbStyle::Primitive)
+is deprecated.
 \reimp
 */
 QGraphicsItem *HbToolButton::primitive(HbStyle::Primitive primitive) const
 {
 Q_D(const HbToolButton);
 /*!
 Initializes \a option with the values from this HbToolButton. This method is useful for
 subclasses when they need a HbStyleOptionToolButton, but don't want to fill in all the
 information themselves.
 */
-void HbToolButton::initStyleOption(HbStyleOptionToolButton *option) const
+void HbToolButton::initStyleOption(HbStyleOptionToolButton *option)
 {
-Q_D(const HbToolButton);
+Q_D(HbToolButton);
 HbAbstractButton::initStyleOption(option);
 Q_ASSERT(option);
 option->customBackground = d->customBackground;
 option->backgroundVisible = d->backgroundVisible;
 option->toolBarPosition = d->toolBarPosition;
 option->orientation = d->orientation;
 option->isCheckable = d->checkable;
 option->useSecondaryGraphics = d->mDialogToolBar;
+option->useTransparentGraphics = false;
+if (mainWindow() && mainWindow()->currentView()) {
+if (mainWindow()->currentView()->viewFlags() & HbView::ViewTitleBarTransparent) {
+option->useTransparentGraphics = true;
+}
+}
 if (d->action) {
 option->text = d->action->text();
 option->icon = d->action->icon();
+option->isToolBarExtension = d->toolbarExtensionFrame;
 }
 }
 /*!
 \internal
 }
 /*!
 \reimp
 */
-void HbToolButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-HbAbstractButton::mousePressEvent(event);
-setProperty("state", "pressed");
-updatePrimitives();
-}
-/*!
-\reimp
-*/
-void HbToolButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-HbAbstractButton::mouseReleaseEvent(event);
-setProperty("state", "normal");
-updatePrimitives();
-}
-/*!
-\reimp
-*/
 void HbToolButton::nextCheckState()
 {
 Q_D(HbToolButton);
 HbAbstractButton::nextCheckState();
 if (!d->action) {
 }
 /*!
 \reimp
 */
+bool HbToolButton::sceneEvent(QEvent *event)
+{
+if (event->type() == QEvent::GraphicsSceneHelp) {
+Q_D(HbToolButton);
+// Check whether toolbutton is inside a toolbar.
+if (d->toolBarPosition != HbStyleOptionToolButton::TB_None) {
+d->showToolTip();
+event->accept();
+return true;
+}
+}
+return HbAbstractButton::sceneEvent(event);
+}
+/*!
+\reimp
+*/
 bool HbToolButton::event(QEvent *event)
 {
-if (event) {
+if (event->type() == QEvent::GraphicsSceneMouseRelease) {
-switch (event->type()) {
+mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event));
-case QEvent::GraphicsSceneMouseRelease: {
+return true;
-mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event));
-return true;
-}
-case QEvent::GraphicsSceneHelp: {
-Q_D(HbToolButton);
-// Check whether toolbutton is inside a toolbar.
-if (d->toolBarPosition != HbStyleOptionToolButton::TB_None) {
-d->showToolTip();
-event->accept();
-return true;
-}
-}
-break;
-default: break;
-}
 }
 return HbAbstractButton::event(event);
 }

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9