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

List:       kde-commits
Subject:    [calligra/flake-configwidgets-boemann] libs/widgets: No background means no fill.
From:       Jean-Nicolas Artaud <jeannicolasartaud () gmail ! com>
Date:       2013-01-23 21:46:27
Message-ID: 20130123214627.8D91DA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 18333e6db8ca167dd2a4f8ef0960318bf345c3dc by Jean-Nicolas Artaud.
Committed on 23/01/2013 at 22:45.
Pushed by artaud into branch 'flake-configwidgets-boemann'.

No background means no fill.

M  +6    -1    libs/widgets/KoFillConfigWidget.cpp

http://commits.kde.org/calligra/18333e6db8ca167dd2a4f8ef0960318bf345c3dc

diff --git a/libs/widgets/KoFillConfigWidget.cpp b/libs/widgets/KoFillConfigWidget.cpp
index 525bb65..4d035f2 100644
--- a/libs/widgets/KoFillConfigWidget.cpp
+++ b/libs/widgets/KoFillConfigWidget.cpp
@@ -457,8 +457,13 @@ void KoFillConfigWidget::updateWidget(KoShape *shape)
     shape->waitUntilReady(zoomHandler, false);
 
     KoShapeBackground *background = shape->background();
-    if(! background)
+    if (! background) {
+        // No Fill
+        d->group->button(KoFillConfigWidget::None)->setChecked(true);
+        d->colorButton->setDefaultAction(d->colorAction);
+        d->colorButton->setPopupMode(QToolButton::InstantPopup);
         return;
+    }
 
     // We don't want the opacity slider to send any signals when it's only initialized.
     // Otherwise an undo record is created.
[prev in list] [next in list] [prev in thread] [next in thread]