[EGIT] [core/enlightenment] master 01/01: Lunchers: If hide tooltips is set, don't even show them on delay.

[Stephen Houston]

okra pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2b165e75e378ae151244bcbfa2daaa768bf0dbbb

commit 2b165e75e378ae151244bcbfa2daaa768bf0dbbb
Author: Stephen Houston <stephen@localhost.localdomain>
Date:   Mon Dec 4 14:44:52 2017 -0600

    Lunchers: If hide tooltips is set, don't even show them on delay.
---
 src/modules/luncher/bar.c  | 32 +++++++++++++++++---------------
 src/modules/luncher/grid.c |  9 ++++++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 701e412af..e75bdabc3 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -1117,21 +1117,23 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, 
E_Client *non_desktop_cli
 
    _bar_icon_file_set(ic, desktop, non_desktop_client);
 
-   if (desktop)
-     elm_object_tooltip_text_set(ic->o_icon, desktop->name);
-   else if (non_desktop_client && non_desktop_client->icccm.class)
-     elm_object_tooltip_text_set(ic->o_icon, non_desktop_client->icccm.class);
-   else if (non_desktop_client && non_desktop_client->icccm.name)
-     elm_object_tooltip_text_set(ic->o_icon, non_desktop_client->icccm.name);
-   else if (non_desktop_client && non_desktop_client->icccm.title)
-     elm_object_tooltip_text_set(ic->o_icon, non_desktop_client->icccm.title);
-   else if (non_desktop_client && non_desktop_client->netwm.name)
-     elm_object_tooltip_text_set(ic->o_icon, non_desktop_client->netwm.name);
-   else
-     elm_object_tooltip_text_set(ic->o_icon, _("Unknown"));
-
-   elm_object_tooltip_orient_set(ic->o_icon, ELM_TOOLTIP_ORIENT_CENTER);
-   elm_object_tooltip_style_set(ic->o_icon, "luncher");
+   if (!inst->cfg->hide_tooltips)
+     {
+        if (desktop)
+          elm_object_tooltip_text_set(ic->o_icon, desktop->name);
+        else if (non_desktop_client && non_desktop_client->icccm.class)
+          elm_object_tooltip_text_set(ic->o_icon, 
non_desktop_client->icccm.class);
+        else if (non_desktop_client && non_desktop_client->icccm.name)
+          elm_object_tooltip_text_set(ic->o_icon, 
non_desktop_client->icccm.name);
+        else if (non_desktop_client && non_desktop_client->icccm.title)
+          elm_object_tooltip_text_set(ic->o_icon, 
non_desktop_client->icccm.title);
+        else if (non_desktop_client && non_desktop_client->netwm.name)
+          elm_object_tooltip_text_set(ic->o_icon, 
non_desktop_client->netwm.name);
+        else
+          elm_object_tooltip_text_set(ic->o_icon, _("Unknown"));
+        elm_object_tooltip_orient_set(ic->o_icon, ELM_TOOLTIP_ORIENT_CENTER);
+        elm_object_tooltip_style_set(ic->o_icon, "luncher");
+     }
    evas_object_size_hint_aspect_set(ic->o_icon, EVAS_ASPECT_CONTROL_BOTH, 1, 
1);
    elm_layout_content_set(ic->o_layout, "e.swallow.icon", ic->o_icon);
    evas_object_event_callback_add(ic->o_icon, EVAS_CALLBACK_MOUSE_UP,
diff --git a/src/modules/luncher/grid.c b/src/modules/luncher/grid.c
index f582e2858..a2f2269ab 100644
--- a/src/modules/luncher/grid.c
+++ b/src/modules/luncher/grid.c
@@ -343,9 +343,12 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
 
    _grid_icon_file_set(ic, desktop);
 
-   elm_object_tooltip_text_set(ic->o_icon, desktop->name);
-   elm_object_tooltip_orient_set(ic->o_icon, ELM_TOOLTIP_ORIENT_CENTER);
-   elm_object_tooltip_style_set(ic->o_icon, "luncher");
+   if (!inst->cfg->hide_tooltips)
+     {
+        elm_object_tooltip_text_set(ic->o_icon, desktop->name);
+        elm_object_tooltip_orient_set(ic->o_icon, ELM_TOOLTIP_ORIENT_CENTER);
+        elm_object_tooltip_style_set(ic->o_icon, "luncher");
+     }
    evas_object_size_hint_aspect_set(ic->o_icon, EVAS_ASPECT_CONTROL_BOTH, 1, 
1);
    elm_layout_content_set(ic->o_layout, "e.swallow.icon", ic->o_icon);
    evas_object_event_callback_add(ic->o_icon, EVAS_CALLBACK_MOUSE_UP,

--