[epiphany/wip/exalm/tabs] headerbar: Subclass HdyHeaderBar



commit c22d80c56cd6eff4c75a3045b99e2e55340080b2
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Sep 8 21:01:59 2020 +0500

    headerbar: Subclass HdyHeaderBar

 src/ephy-header-bar.c | 17 ++++++++---------
 src/ephy-header-bar.h |  6 ++++--
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index efb58959f..11290935e 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -36,7 +36,6 @@
 #include "ephy-type-builtins.h"
 
 #include <glib/gi18n.h>
-#include <handy.h>
 
 enum {
   PROP_0,
@@ -50,7 +49,7 @@ static GParamSpec *object_properties[N_PROPERTIES] = { NULL, };
 static const char *REFRESH_BUTTON_TOOLTIP = N_("Reload the current page");
 
 struct _EphyHeaderBar {
-  GtkHeaderBar parent_instance;
+  HdyHeaderBar parent_instance;
 
   EphyWindow *window;
   EphyTitleWidget *title_widget;
@@ -65,7 +64,7 @@ struct _EphyHeaderBar {
   GtkWidget *combined_stop_reload_image;
 };
 
-G_DEFINE_TYPE (EphyHeaderBar, ephy_header_bar, GTK_TYPE_HEADER_BAR)
+G_DEFINE_TYPE (EphyHeaderBar, ephy_header_bar, HDY_TYPE_HEADER_BAR)
 
 static void
 ephy_header_bar_set_property (GObject      *object,
@@ -123,7 +122,7 @@ fullscreen_changed_cb (EphyHeaderBar *header_bar)
 
   g_object_get (header_bar->window, "fullscreen", &fullscreen, NULL);
 
-  gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header_bar), !fullscreen);
+  hdy_header_bar_set_show_close_button (HDY_HEADER_BAR (header_bar), !fullscreen);
   gtk_widget_set_visible (header_bar->restore_button, fullscreen);
   ephy_action_bar_set_is_fullscreen (header_bar->action_bar_start, fullscreen);
 }
@@ -194,7 +193,7 @@ ephy_header_bar_constructed (GObject *object)
   gtk_revealer_set_transition_type (GTK_REVEALER (header_bar->start_revealer), 
GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
   gtk_container_add (GTK_CONTAINER (header_bar->start_revealer), GTK_WIDGET (header_bar->action_bar_start));
 
-  gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar),
+  hdy_header_bar_pack_start (HDY_HEADER_BAR (header_bar),
                              GTK_WIDGET (header_bar->start_revealer));
 
   embed_shell = ephy_embed_shell_get_default ();
@@ -209,7 +208,7 @@ ephy_header_bar_constructed (GObject *object)
   event_box = gtk_event_box_new ();
   gtk_widget_add_events (event_box, GDK_ALL_EVENTS_MASK);
   gtk_widget_show (event_box);
-  gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), event_box);
+  hdy_header_bar_set_custom_title (HDY_HEADER_BAR (header_bar), event_box);
   gtk_widget_set_name (event_box, "title-box-container");
 
   if (is_desktop_pantheon ()) {
@@ -252,7 +251,7 @@ ephy_header_bar_constructed (GObject *object)
   g_signal_connect_object (header_bar->restore_button, "clicked",
                            G_CALLBACK (restore_button_clicked_cb),
                            header_bar, 0);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
+  hdy_header_bar_pack_end (HDY_HEADER_BAR (header_bar),
                            GTK_WIDGET (header_bar->restore_button));
 
   /* Page Menu */
@@ -309,7 +308,7 @@ ephy_header_bar_constructed (GObject *object)
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), page_menu_popover);
   g_object_unref (builder);
 
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar), button);
+  hdy_header_bar_pack_end (HDY_HEADER_BAR (header_bar), button);
 
   /* End action elements */
   header_bar->action_bar_end = ephy_action_bar_end_new ();
@@ -322,7 +321,7 @@ ephy_header_bar_constructed (GObject *object)
   gtk_revealer_set_transition_type (GTK_REVEALER (header_bar->end_revealer), 
GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT);
   gtk_container_add (GTK_CONTAINER (header_bar->end_revealer), GTK_WIDGET (header_bar->action_bar_end));
 
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar),
+  hdy_header_bar_pack_end (HDY_HEADER_BAR (header_bar),
                            GTK_WIDGET (header_bar->end_revealer));
 
   /* Sync the size of placeholder in EphyActionBarStart with downloads button */
diff --git a/src/ephy-header-bar.h b/src/ephy-header-bar.h
index 206c34268..ff0b8d6d7 100644
--- a/src/ephy-header-bar.h
+++ b/src/ephy-header-bar.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gtk/gtk.h>
+#include <handy.h>
 
 #include "ephy-action-bar-end.h"
 #include "ephy-action-bar-start.h"
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_HEADER_BAR (ephy_header_bar_get_type())
 
-G_DECLARE_FINAL_TYPE (EphyHeaderBar, ephy_header_bar, EPHY, HEADER_BAR, GtkHeaderBar)
+G_DECLARE_FINAL_TYPE (EphyHeaderBar, ephy_header_bar, EPHY, HEADER_BAR, HdyHeaderBar)
 
 GtkWidget          *ephy_header_bar_new                            (EphyWindow    *window);
 EphyTitleWidget    *ephy_header_bar_get_title_widget               (EphyHeaderBar *header_bar);
@@ -47,5 +47,7 @@ void                ephy_header_bar_set_adaptive_mode              (EphyHeaderBa
                                                                     EphyAdaptiveMode  adaptive_mode);
 void                ephy_header_bar_start_change_combined_stop_reload_state (EphyHeaderBar *header_bar,
                                                                              gboolean       loading);
+void                ephy_header_bar_set_fullscreen                 (EphyHeaderBar *header_bar,
+                                                                    gboolean       fullscreen);
 
 G_END_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]