Widgets|libappfw: Focus indicator is hidden when using the mouse

The focus indicator is meant for keyboard input events.
skyjake · Oct 15, 2016 · f688d40 · f688d40
1 parent 43154d6
commit f688d40
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/widgets/focuswidget.h b/doomsday/sdk/libappfw/include/de/widgets/focuswidget.h
@@ -39,6 +39,9 @@ class LIBAPPFW_PUBLIC FocusWidget : public LabelWidget
     void startFlashing(GuiWidget const *reference = nullptr);
     void stopFlashing();
 
+    void fadeIn();
+    void fadeOut();
+
     // Events.
     void update() override;
 

diff --git a/doomsday/sdk/libappfw/src/guirootwidget.cpp b/doomsday/sdk/libappfw/src/guirootwidget.cpp
@@ -326,6 +326,13 @@ void GuiRootWidget::dispatchLatestMousePosition()
 bool GuiRootWidget::processEvent(Event const &event)
 {
     window().glActivate();
+
+    if (event.type() == Event::MouseButton &&
+        event.as<MouseEvent>().state() != MouseEvent::Released)
+    {
+        d->focusIndicator->fadeOut();
+    }
+
     bool const wasProcessed = RootWidget::processEvent(event);
 //    {
 //        if (event.type() == Event::MouseButton)

diff --git a/doomsday/sdk/libappfw/src/guiwidget.cpp b/doomsday/sdk/libappfw/src/guiwidget.cpp
@@ -907,6 +907,7 @@ bool GuiWidget::handleEvent(Event const &event)
             if (auto *focus = d->findNextWidgetToFocus(
                         key.modifiers().testFlag(KeyEvent::Shift)? Backward : Forward))
             {
+                root().focusIndicator().fadeIn();
                 root().setFocus(focus);
                 return true;
             }
@@ -917,6 +918,7 @@ bool GuiWidget::handleEvent(Event const &event)
              key.ddKey() == DDKEY_UPARROW    ||
              key.ddKey() == DDKEY_DOWNARROW))
         {
+            root().focusIndicator().fadeIn();
             root().setFocus(d->findAdjacentWidgetToFocus(
                                 key.ddKey() == DDKEY_LEFTARROW ? ui::Left  :
                                 key.ddKey() == DDKEY_RIGHTARROW? ui::Right :

diff --git a/doomsday/sdk/libappfw/src/widgets/buttonwidget.cpp b/doomsday/sdk/libappfw/src/widgets/buttonwidget.cpp
@@ -20,6 +20,7 @@
 #include "de/GuiRootWidget"
 #include "de/CallbackAction"
 
+#include <de/FocusWidget>
 #include <de/MouseEvent>
 #include <de/Animation>
 
@@ -320,6 +321,7 @@ bool ButtonWidget::handleEvent(Event const &event)
         {
             if (key.isKeyDown())
             {
+                root().focusIndicator().fadeIn();
                 trigger();
             }
             return true;

diff --git a/doomsday/sdk/libappfw/src/widgets/focuswidget.cpp b/doomsday/sdk/libappfw/src/widgets/focuswidget.cpp
@@ -30,6 +30,7 @@ DENG2_PIMPL(FocusWidget)
     SafeWidgetPtr<GuiWidget const> reference;
     Animation color { 0.f, Animation::Linear };
     Vector4f flashColors[2];
+    float fadeOpacity = 0.f;
 
     Impl(Public *i) : Base(i)
     {
@@ -85,9 +86,19 @@ void FocusWidget::stopFlashing()
     hide();
 }
 
+void FocusWidget::fadeIn()
+{
+    d->fadeOpacity = 1.f;
+}
+
+void FocusWidget::fadeOut()
+{
+    d->fadeOpacity = 0.f;
+}
+
 void FocusWidget::update()
 {
-    setOpacity(d->reference? d->reference->visibleOpacity() : 0.f);
+    setOpacity(d->fadeOpacity * (d->reference? d->reference->visibleOpacity() : 0.f));
     set(Background(Background::GradientFrameWithThinBorder, d->currentColor(), 6));
 
     LabelWidget::update();

diff --git a/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp
@@ -17,14 +17,16 @@
  */
 
 #include "de/MenuWidget"
-#include "de/PopupMenuWidget"
-#include "de/PopupButtonWidget"
-#include "de/VariableToggleWidget"
+
 #include "de/ChildWidgetOrganizer"
+#include "de/FocusWidget"
 #include "de/GridLayout"
+#include "de/PopupButtonWidget"
+#include "de/PopupMenuWidget"
 #include "de/StyleProceduralImage"
-#include "de/ui/ListData"
+#include "de/VariableToggleWidget"
 #include "de/ui/ActionItem"
+#include "de/ui/ListData"
 #include "de/ui/SubwidgetItem"
 #include "de/ui/VariantActionItem"
 
@@ -682,6 +684,8 @@ bool MenuWidget::handleEvent(Event const &event)
         KeyEvent const &key = event.as<KeyEvent>();
         if (key.ddKey() == DDKEY_UPARROW || key.ddKey() == DDKEY_DOWNARROW)
         {
+            root().focusIndicator().fadeIn();
+
             auto const children = childWidgets();
 
             for (int ordinal = children.indexOf(root().focus());