[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/KDE/4.9] plasma/generic/applets/activitybar: activitybar orientation dependent from s
From:       Marco Martin <notmart () gmail ! com>
Date:       2012-06-27 9:07:24
Message-ID: 20120627090724.68AD5A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 1469527c1dfc257f85e85da93e80df82744ea7b1 by Marco Martin.
Committed on 27/06/2012 at 11:01.
Pushed by mart into branch 'KDE/4.9'.

activitybar orientation dependent from size too

BUG:256040
FIXED-IN:4.9

M  +11   -5    plasma/generic/applets/activitybar/activitybar.cpp

http://commits.kde.org/kde-workspace/1469527c1dfc257f85e85da93e80df82744ea7b1

diff --git a/plasma/generic/applets/activitybar/activitybar.cpp \
b/plasma/generic/applets/activitybar/activitybar.cpp index c59fb2d..17711fc 100644
--- a/plasma/generic/applets/activitybar/activitybar.cpp
+++ b/plasma/generic/applets/activitybar/activitybar.cpp
@@ -52,6 +52,7 @@ void ActivityBar::init()
 {
     QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(this);
     m_tabBar = new Plasma::TabBar(this);
+    m_tabBar->nativeWidget()->setDrawBase(false);
     layout->addItem(m_tabBar);
     layout->setContentsMargins(0,0,0,0);
     //layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 @@ -153,15 +154,20 @@ void ActivityBar::insertActivity(const QString &id)
 
 void ActivityBar::constraintsEvent(Plasma::Constraints constraints)
 {
-    if (constraints & Plasma::FormFactorConstraint ) {
-        if (formFactor() == Plasma::Vertical) {
+    if (constraints & Plasma::FormFactorConstraint ||
+        constraints & Plasma::SizeConstraint) {
+        if ((formFactor() == Plasma::Vertical ||
+            size().height() > size().width()) &&
+            m_tabBar->nativeWidget()->shape() != QTabBar::RoundedWest) {
             m_tabBar->nativeWidget()->setShape(QTabBar::RoundedWest);
-        } else {
+        } else if (m_tabBar->nativeWidget()->shape() != QTabBar::RoundedNorth &&
+            (formFactor() == Plasma::Horizontal ||
+            size().height() <= size().width())) {
             m_tabBar->nativeWidget()->setShape(QTabBar::RoundedNorth);
+        } else {
+            return;
         }
 
-        m_tabBar->nativeWidget()->setDrawBase(formFactor() != Plasma::Vertical && \
                formFactor() != Plasma::Horizontal);
-
         setPreferredSize(m_tabBar->nativeWidget()->sizeHint());
         setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
         emit sizeHintChanged(Qt::PreferredSize);


[prev in list] [next in list] [prev in thread] [next in thread]