Widgets|libappfw: Allow overriding manual widget opacity

skyjake · Feb 5, 2017 · 0fabcb4 · 0fabcb4
1 parent 0b57cf3
commit 0fabcb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/framework/guiwidget.h b/doomsday/sdk/libappfw/include/de/framework/guiwidget.h
@@ -187,6 +187,12 @@ class LIBAPPFW_PUBLIC GuiWidget : public QObject, public Widget
          */
         ManualOpacity = 0x10,
 
+        /**
+         * Widget will automatically change opacity depending on state. This overrides
+         * ManualOpacity has family behavior.
+         */
+        AutomaticOpacity = 0x200,
+
         /**
          * Prevents the drawing of the widget contents even if it visible. The
          * texture containing the blurred background is updated regardless.

diff --git a/doomsday/sdk/libappfw/src/guiwidget.cpp b/doomsday/sdk/libappfw/src/guiwidget.cpp
@@ -318,7 +318,7 @@ DENG2_PIMPL(GuiWidget)
             opacityWhenDisabled.setValue(opac, .3f);
         }
         if (firstUpdateAfterCreation ||
-           !attribs.testFlag(AnimateOpacityWhenEnabledOrDisabled))
+            !attribs.testFlag(AnimateOpacityWhenEnabledOrDisabled))
         {
             opacityWhenDisabled.finish();
         }
@@ -867,11 +867,12 @@ void GuiWidget::update()
         d->styleChanged = false;
         updateStyle();
     }
-    if (!familyAttributes().testFlag(ManualOpacity))
+    auto const familyAttribs = familyAttributes();
+    if ( familyAttribs.testFlag(AutomaticOpacity) ||
+        !familyAttribs.testFlag(ManualOpacity))
     {
         d->updateOpacityForDisabledWidgets();
     }
-
     d->firstUpdateAfterCreation = false;
 }