Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--shell/view/home/MeshBox.py10
2 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 6c70525..22322f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #4716: Filter correctly activity icons in the mesh view. (tomeu)
* Use HOME/.i18n in control panel and reset jabber_registered to False (erikos)
Snapshot dae3ebe8d1
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index 0a23020..696dc86 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -290,11 +290,13 @@ class ActivityView(hippo.CanvasBox):
self._shell.join_activity(bundle_id, self._model.get_id())
def set_filter(self, query):
- if self._model.activity.props.name.lower().find(query) == -1:
- self._icon.xo_color = [style.COLOR_INACTIVE_STROKE.get_svg(),
- style.COLOR_INACTIVE_FILL.get_svg()]
+ text_to_check = self._model.activity.props.name.lower() + \
+ self._model.activity.props.type.lower()
+ if text_to_check.find(query) == -1:
+ self._icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
+ self._icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
else:
- self._icon.xo_color = self._model.get_color()
+ self._icon.props.xo_color = self._model.get_color()
_AUTOSEARCH_TIMEOUT = 1000