GNOME.org
 

[epiphany/wip/exalm/starred-icons] Bundle (non-)starred-symbolic icons


commit d38be13cba6560f6cfee6a42f9edf8767ed4b3ce
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Aug 8 17:29:48 2022 +0400

    Bundle (non-)starred-symbolic icons
    
    As of https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/c19295d8848bd360313cef14fbf9a1d59a483962
    non-starred-symbolic is partially transparent and looks insensitive where
    we use it. Bundle the old version and use it instead.

 lib/widgets/ephy-location-entry.c           | 6 +++---
 src/ephy-action-bar-end.c                   | 4 ++--
 src/ephy-suggestion-model.c                 | 2 +-
 src/resources/ephy-non-starred-symbolic.svg | 4 ++++
 src/resources/ephy-starred-symbolic.svg     | 4 ++++
 src/resources/epiphany.gresource.xml        | 2 ++
 src/resources/gtk/action-bar-end.ui         | 2 +-
 src/resources/gtk/bookmarks-popover.ui      | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index a168104f8..92b7682ad 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -1102,7 +1102,7 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry)
                            G_CALLBACK (update_reader_icon), entry, G_CONNECT_SWAPPED);
 
   /* Bookmark */
-  entry->bookmark_icon = gtk_image_new_from_icon_name ("non-starred-symbolic", GTK_ICON_SIZE_MENU);
+  entry->bookmark_icon = gtk_image_new_from_icon_name ("ephy-non-starred-symbolic", GTK_ICON_SIZE_MENU);
   context = gtk_widget_get_style_context (entry->bookmark_icon);
   gtk_style_context_add_class (context, "entry_icon");
   gtk_widget_show (entry->bookmark_icon);
@@ -1405,7 +1405,7 @@ ephy_location_entry_set_bookmark_icon_state (EphyLocationEntry     *self,
     case EPHY_BOOKMARK_ICON_EMPTY:
       gtk_widget_set_visible (self->bookmark_button, TRUE);
       gtk_image_set_from_icon_name (GTK_IMAGE (self->bookmark_icon),
-                                    "non-starred-symbolic",
+                                    "ephy-non-starred-symbolic",
                                     GTK_ICON_SIZE_MENU);
       gtk_style_context_remove_class (context, "starred");
       gtk_style_context_add_class (context, "non-starred");
@@ -1413,7 +1413,7 @@ ephy_location_entry_set_bookmark_icon_state (EphyLocationEntry     *self,
     case EPHY_BOOKMARK_ICON_BOOKMARKED:
       gtk_widget_set_visible (self->bookmark_button, TRUE);
       gtk_image_set_from_icon_name (GTK_IMAGE (self->bookmark_icon),
-                                    "starred-symbolic",
+                                    "ephy-starred-symbolic",
                                     GTK_ICON_SIZE_MENU);
       gtk_style_context_remove_class (context, "non-starred");
       gtk_style_context_add_class (context, "starred");
diff --git a/src/ephy-action-bar-end.c b/src/ephy-action-bar-end.c
index 5af19cf7b..c6e0cd154 100644
--- a/src/ephy-action-bar-end.c
+++ b/src/ephy-action-bar-end.c
@@ -377,13 +377,13 @@ ephy_action_bar_end_set_bookmark_icon_state (EphyActionBarEnd      *action_bar_e
     case EPHY_BOOKMARK_ICON_EMPTY:
       gtk_widget_set_visible (action_bar_end->bookmark_button, TRUE);
       gtk_image_set_from_icon_name (GTK_IMAGE (action_bar_end->bookmark_image),
-                                    "non-starred-symbolic",
+                                    "ephy-non-starred-symbolic",
                                     GTK_ICON_SIZE_BUTTON);
       break;
     case EPHY_BOOKMARK_ICON_BOOKMARKED:
       gtk_widget_set_visible (action_bar_end->bookmark_button, TRUE);
       gtk_image_set_from_icon_name (GTK_IMAGE (action_bar_end->bookmark_image),
-                                    "starred-symbolic",
+                                    "ephy-starred-symbolic",
                                     GTK_ICON_SIZE_BUTTON);
       break;
     default:
diff --git a/src/ephy-suggestion-model.c b/src/ephy-suggestion-model.c
index 3299e2db6..ddfea8aae 100644
--- a/src/ephy-suggestion-model.c
+++ b/src/ephy-suggestion-model.c
@@ -588,7 +588,7 @@ bookmarks_query (EphySuggestionModel *self,
       escaped_title = g_markup_escape_text (title, -1);
       markup = dzl_fuzzy_highlight (escaped_title, data->query, FALSE);
       suggestion = ephy_suggestion_new (markup, title, url);
-      ephy_suggestion_set_secondary_icon (suggestion, "starred-symbolic");
+      ephy_suggestion_set_secondary_icon (suggestion, "ephy-starred-symbolic");
 
       g_sequence_append (data->bookmarks, g_object_ref (suggestion));
     }
diff --git a/src/resources/ephy-non-starred-symbolic.svg b/src/resources/ephy-non-starred-symbolic.svg
new file mode 100644
index 000000000..7d9b77039
--- /dev/null
+++ b/src/resources/ephy-non-starred-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg";>
+    <path d="m 8 0 c -0.429688 0 -0.8125 0.273438 -0.949219 0.683594 l -1.449219 4.339844 l -4.589843 
-0.015626 c -0.4375 0 -0.828125 0.28125 -0.9609378 0.695313 c -0.1328124 0.417969 0.0195313 0.871094 
0.3789068 1.125 l 3.625 2.554687 l -1.5 4.285157 c -0.140626 0.40625 -0.011719 0.855469 0.328124 1.121093 c 
0.335938 0.261719 0.804688 0.285157 1.164063 0.050782 l 4.003906 -2.59375 l 3.894531 2.585937 c 0.359376 
0.238281 0.828126 0.222657 1.167969 -0.042969 c 0.339844 -0.261718 0.472657 -0.714843 0.332031 -1.117187 l 
-1.503906 -4.289063 l 3.644532 -2.578124 c 0.351562 -0.25 0.503906 -0.703126 0.371093 -1.113282 c -0.128906 
-0.414062 -0.511719 -0.695312 -0.945312 -0.699218 l -4.660157 -0.015626 l -1.402343 -4.285156 c -0.132813 
-0.410156 -0.515625 -0.68749975 -0.949219 -0.691406 z m -0.007812 4.1875 l 0.683593 2.097656 c 0.132813 
0.40625 0.515625 0.6875 0.945313 0.6875 l 2.253906 0.007813 l -1.703125 1.203125 c -0.363281 0.257812 
-0.511719 0.726562 -0.363281 1.148437 l 0.765625 2.191
 407 l -1.964844 -1.304688 c -0.332031 -0.222656 -0.761719 -0.222656 -1.097656 -0.007812 l -2.101563 1.363281 
l 0.785156 -2.242188 c 0.144532 -0.421875 -0.003906 -0.890625 -0.367187 -1.148437 l -1.652344 -1.164063 l 
2.144531 0.007813 c 0.429688 0 0.8125 -0.277344 0.949219 -0.683594 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/src/resources/ephy-starred-symbolic.svg b/src/resources/ephy-starred-symbolic.svg
new file mode 100644
index 000000000..9249d421d
--- /dev/null
+++ b/src/resources/ephy-starred-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg";>
+    <path d="m 8 0 c -0.429688 0 -0.8125 0.273438 -0.949219 0.683594 l -1.449219 4.339844 l -4.589843 
-0.015626 c -0.980469 -0.003906 -1.382813 1.257813 -0.582031 1.820313 l 3.625 2.554687 l -1.5 4.285157 c 
-0.316407 0.902343 0.6875 1.691406 1.492187 1.171875 l 4.003906 -2.59375 l 3.894531 2.585937 c 0.800782 
0.53125 1.816407 -0.257812 1.5 -1.160156 l -1.503906 -4.289063 l 3.644532 -2.578124 c 0.789062 -0.5625 
0.394531 -1.808594 -0.574219 -1.8125 l -4.660157 -0.015626 l -1.402343 -4.285156 c -0.132813 -0.410156 
-0.515625 -0.68749975 -0.949219 -0.691406 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index d72cdcc7b..d962bccd1 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -54,7 +54,9 @@
     <file compressed="true" 
alias="scalable/actions/ephy-reader-mode-symbolic.svg">ephy-reader-mode-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-audio-muted-symbolic.svg">ephy-audio-muted-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-audio-playing-symbolic.svg">ephy-audio-playing-symbolic.svg</file>
+    <file compressed="true" 
alias="scalable/status/ephy-non-starred-symbolic.svg">ephy-non-starred-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-open-link-symbolic.svg">ephy-open-link-symbolic.svg</file>
+    <file compressed="true" 
alias="scalable/status/ephy-starred-symbolic.svg">ephy-starred-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-tab-counter-symbolic.svg">ephy-tab-counter-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-tab-overflow-symbolic.svg">ephy-tab-overflow-symbolic.svg</file>
     <file compressed="true" 
alias="scalable/status/ephy-library-symbolic.svg">ephy-library-symbolic.svg</file>
diff --git a/src/resources/gtk/action-bar-end.ui b/src/resources/gtk/action-bar-end.ui
index c11e194b3..fc86d7b69 100644
--- a/src/resources/gtk/action-bar-end.ui
+++ b/src/resources/gtk/action-bar-end.ui
@@ -58,7 +58,7 @@
           <object class="GtkImage" id="bookmark_image">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="icon_name">non-starred-symbolic</property>
+            <property name="icon_name">ephy-non-starred-symbolic</property>
           </object>
         </child>
         <style>
diff --git a/src/resources/gtk/bookmarks-popover.ui b/src/resources/gtk/bookmarks-popover.ui
index 5925e0a47..67148190a 100644
--- a/src/resources/gtk/bookmarks-popover.ui
+++ b/src/resources/gtk/bookmarks-popover.ui
@@ -150,7 +150,7 @@
                 <property name="visible">true</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="icon-name">non-starred-symbolic</property>
+                    <property name="icon-name">ephy-non-starred-symbolic</property>
                     <property name="pixel-size">64</property>
                     <property name="visible">true</property>
                     <style>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]