[epiphany] Use small url text scaling in narrow mode

[Marge Bot <marge-bot src gnome org>]

commit 358376405df0376f227b2ff01f0a12008fced8d6
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Thu Jun 3 17:26:52 2021 +0200

    Use small url text scaling in narrow mode
    
    Relates: https://gitlab.gnome.org/GNOME/epiphany/-/issues/1172
    Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/971>

 {src => lib}/ephy-adaptive-mode.h |  0
 lib/widgets/ephy-location-entry.c | 33 +++++++++++++++++++++++----------
 lib/widgets/ephy-location-entry.h |  5 +++--
 src/ephy-header-bar.c             |  2 +-
 4 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/src/ephy-adaptive-mode.h b/lib/ephy-adaptive-mode.h
similarity index 100%
rename from src/ephy-adaptive-mode.h
rename to lib/ephy-adaptive-mode.h
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index fd8a63056..e8761e852 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -87,6 +87,7 @@ struct _EphyLocationEntry {
   guint original_address : 1;
 
   EphySecurityLevel security_level;
+  EphyAdaptiveMode adaptive_mode;
 };
 
 static gboolean ephy_location_entry_reset_internal (EphyLocationEntry *,
@@ -134,20 +135,26 @@ entry_button_release (GtkWidget *widget,
 }
 
 static void
-update_entry_style (GtkWidget *entry)
+update_entry_style (EphyLocationEntry *self)
 {
   PangoAttrList *attrs;
   PangoAttribute *color_normal;
   PangoAttribute *color_dimmed;
+  PangoAttribute *scaled;
   g_autoptr (GUri) uri = NULL;
-  const char *text = gtk_entry_get_text (GTK_ENTRY (entry));
+  const char *text = gtk_entry_get_text (GTK_ENTRY (self->url_entry));
   const char *host;
   const char *base_domain;
   char *sub_string;
 
   attrs = pango_attr_list_new ();
 
-  if (gtk_widget_has_focus (entry))
+  if (self->adaptive_mode == EPHY_ADAPTIVE_MODE_NARROW) {
+    scaled = pango_attr_scale_new (PANGO_SCALE_SMALL);
+    pango_attr_list_insert (attrs, scaled);
+  }
+
+  if (gtk_widget_has_focus (self->url_entry))
     goto out;
 
   uri = g_uri_parse (text, G_URI_FLAGS_NONE, NULL);
@@ -177,7 +184,7 @@ update_entry_style (GtkWidget *entry)
   pango_attr_list_insert (attrs, color_normal);
 
 out:
-  gtk_entry_set_attributes (GTK_ENTRY (entry), attrs);
+  gtk_entry_set_attributes (GTK_ENTRY (self->url_entry), attrs);
 
   pango_attr_list_unref (attrs);
 }
@@ -187,7 +194,9 @@ entry_focus_in_event (GtkWidget *widget,
                       GdkEvent  *event,
                       gpointer   user_data)
 {
-  update_entry_style (widget);
+  EphyLocationEntry *self = EPHY_LOCATION_ENTRY (user_data);
+
+  update_entry_style (self);
   return GDK_EVENT_PROPAGATE;
 }
 
@@ -198,7 +207,7 @@ entry_focus_out_event (GtkWidget *widget,
 {
   EphyLocationEntry *entry = EPHY_LOCATION_ENTRY (user_data);
 
-  update_entry_style (widget);
+  update_entry_style (entry);
 
   if (((GdkEventButton *)event)->button != GDK_BUTTON_PRIMARY)
     return GDK_EVENT_PROPAGATE;
@@ -293,7 +302,7 @@ ephy_location_entry_title_widget_set_address (EphyTitleWidget *widget,
   entry->block_update = TRUE;
   g_signal_handlers_block_by_func (entry->url_entry, G_CALLBACK (editable_changed_cb), entry);
   gtk_entry_set_text (GTK_ENTRY (entry->url_entry), final_text);
-  update_entry_style (entry->url_entry);
+  update_entry_style (entry);
   g_signal_handlers_unblock_by_func (entry->url_entry, G_CALLBACK (editable_changed_cb), entry);
 
   dzl_suggestion_entry_hide_suggestions (DZL_SUGGESTION_ENTRY (entry->url_entry));
@@ -1564,13 +1573,17 @@ ephy_location_entry_set_progress (EphyLocationEntry *entry,
 }
 
 void
-ephy_location_entry_set_mobile_popdown (EphyLocationEntry *entry,
-                                        gboolean           mobile_popdown)
+ephy_location_entry_set_adaptive_mode (EphyLocationEntry *entry,
+                                       EphyAdaptiveMode   adaptive_mode)
 {
-  if (mobile_popdown)
+  if (adaptive_mode == EPHY_ADAPTIVE_MODE_NARROW)
     dzl_suggestion_entry_set_position_func (DZL_SUGGESTION_ENTRY (entry->url_entry), 
dzl_suggestion_entry_window_position_func, NULL, NULL);
   else
     dzl_suggestion_entry_set_position_func (DZL_SUGGESTION_ENTRY (entry->url_entry), position_func, NULL, 
NULL);
+
+  entry->adaptive_mode = adaptive_mode;
+
+  update_entry_style (entry);
 }
 
 void
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index a9ce24084..025f4389b 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -25,6 +25,7 @@
 
 #include <gtk/gtk.h>
 
+#include "ephy-adaptive-mode.h"
 #include "ephy-security-levels.h"
 
 G_BEGIN_DECLS
@@ -84,7 +85,7 @@ void            ephy_location_entry_page_action_add            (EphyLocationEntr
 
 void            ephy_location_entry_page_action_clear          (EphyLocationEntry *entry);
 
-void            ephy_location_entry_set_mobile_popdown         (EphyLocationEntry *entry,
-                                                                gboolean           mobile_popdown);
+void            ephy_location_entry_set_adaptive_mode          (EphyLocationEntry *entry,
+                                                                EphyAdaptiveMode   adpative_mode);
 
 G_END_DECLS
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index c51a6fe81..6f509b200 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -459,7 +459,7 @@ ephy_header_bar_set_adaptive_mode (EphyHeaderBar    *header_bar,
   }
 
   if (ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) != EPHY_EMBED_SHELL_MODE_APPLICATION)
-    ephy_location_entry_set_mobile_popdown (EPHY_LOCATION_ENTRY (header_bar->title_widget), adaptive_mode == 
EPHY_ADAPTIVE_MODE_NARROW);
+    ephy_location_entry_set_adaptive_mode (EPHY_LOCATION_ENTRY (header_bar->title_widget), adaptive_mode);
 }
 
 void