[epiphany/wip/exalm/gtk4-cleanups-3: 1/9] Clean up [hv]align and [hv]expand use
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/exalm/gtk4-cleanups-3: 1/9] Clean up [hv]align and [hv]expand use
- Date: Thu, 2 Dec 2021 15:38:46 +0000 (UTC)
commit 1ad496f72b617f07b20bf8ce0c07a8179697ffec
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Dec 2 03:32:02 2021 +0500
Clean up [hv]align and [hv]expand use
A lot of places where we used these properties wasn't necessary. In some
cases it worked but would mess up labels in GTK4.
lib/ephy-notification.c | 4 ++--
lib/widgets/ephy-certificate-dialog.c | 6 ------
lib/widgets/ephy-download-widget.c | 4 ----
lib/widgets/ephy-downloads-progress-icon.c | 2 --
lib/widgets/ephy-location-entry.c | 2 --
lib/widgets/ephy-security-popover.c | 2 --
lib/widgets/ephy-title-box.c | 5 ++---
src/bookmarks/ephy-bookmarks-popover.c | 1 -
src/ephy-header-bar.c | 2 --
src/resources/gtk/action-bar-end.ui | 5 -----
src/resources/gtk/action-bar-start.ui | 5 -----
src/resources/gtk/action-bar.ui | 1 -
src/resources/gtk/bookmark-properties.ui | 8 +++-----
src/resources/gtk/bookmark-row.ui | 1 -
src/resources/gtk/bookmarks-popover.ui | 1 -
src/resources/gtk/clear-data-view.ui | 1 -
src/resources/gtk/data-view.ui | 4 ----
src/resources/gtk/encoding-dialog.ui | 6 +++---
src/resources/gtk/firefox-sync-dialog.ui | 2 +-
src/resources/gtk/history-dialog.ui | 4 ----
src/resources/gtk/lang-row.ui | 2 +-
src/resources/gtk/page-menu-popover.ui | 1 -
src/resources/gtk/page-row.ui | 3 ---
src/resources/gtk/pages-button.ui | 2 --
src/resources/gtk/prefs-lang-dialog.ui | 4 +---
src/resources/gtk/search-engine-listbox.ui | 2 --
src/resources/gtk/search-engine-row.ui | 8 +++-----
src/resources/gtk/synced-tabs-dialog.ui | 2 +-
src/resources/gtk/webapp-additional-urls-dialog.ui | 3 +--
src/webextension/ephy-web-extension-manager.c | 3 ---
30 files changed, 18 insertions(+), 78 deletions(-)
---
diff --git a/lib/ephy-notification.c b/lib/ephy-notification.c
index 38ccc8829..c7f732b05 100644
--- a/lib/ephy-notification.c
+++ b/lib/ephy-notification.c
@@ -135,13 +135,13 @@ ephy_notification_init (EphyNotification *self)
self->head = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (self->head), TRUE);
- gtk_widget_set_halign (self->head, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (self->head), 0);
gtk_widget_set_hexpand (self->head, TRUE);
gtk_grid_attach (GTK_GRID (self->grid), self->head, 0, 0, 1, 1);
self->body = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (self->body), TRUE);
- gtk_widget_set_halign (self->body, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (self->body), 0);
gtk_widget_set_hexpand (self->body, TRUE);
gtk_grid_attach (GTK_GRID (self->grid), self->body, 0, 1, 1, 1);
diff --git a/lib/widgets/ephy-certificate-dialog.c b/lib/widgets/ephy-certificate-dialog.c
index 9241e74a3..68597198f 100644
--- a/lib/widgets/ephy-certificate-dialog.c
+++ b/lib/widgets/ephy-certificate-dialog.c
@@ -291,8 +291,6 @@ ephy_certificate_dialog_init (EphyCertificateDialog *dialog)
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
dialog->icon = gtk_image_new ();
- gtk_widget_set_halign (dialog->icon, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (dialog->icon, GTK_ALIGN_START);
gtk_grid_attach (GTK_GRID (grid), dialog->icon,
0, 0, 1, 2);
gtk_widget_show (dialog->icon);
@@ -301,8 +299,6 @@ ephy_certificate_dialog_init (EphyCertificateDialog *dialog)
gtk_label_set_use_markup (GTK_LABEL (dialog->title), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (dialog->title), TRUE);
gtk_label_set_selectable (GTK_LABEL (dialog->title), TRUE);
- gtk_widget_set_halign (dialog->title, GTK_ALIGN_START);
- gtk_widget_set_valign (dialog->title, GTK_ALIGN_CENTER);
gtk_label_set_xalign (GTK_LABEL (dialog->title), 0.0);
gtk_grid_attach_next_to (GTK_GRID (grid), dialog->title,
dialog->icon, GTK_POS_RIGHT,
@@ -312,8 +308,6 @@ ephy_certificate_dialog_init (EphyCertificateDialog *dialog)
dialog->text = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (dialog->text), TRUE);
gtk_label_set_selectable (GTK_LABEL (dialog->text), TRUE);
- gtk_widget_set_halign (dialog->text, GTK_ALIGN_START);
- gtk_widget_set_valign (dialog->text, GTK_ALIGN_START);
gtk_label_set_xalign (GTK_LABEL (dialog->text), 0.0);
gtk_label_set_yalign (GTK_LABEL (dialog->text), 0.0);
gtk_grid_attach_next_to (GTK_GRID (grid), dialog->text,
diff --git a/lib/widgets/ephy-download-widget.c b/lib/widgets/ephy-download-widget.c
index ec657c892..b81c567a8 100644
--- a/lib/widgets/ephy-download-widget.c
+++ b/lib/widgets/ephy-download-widget.c
@@ -387,14 +387,12 @@ ephy_download_widget_constructed (GObject *object)
widget->icon = gtk_image_new ();
gtk_widget_set_margin_end (widget->icon, 4);
- gtk_widget_set_halign (widget->icon, GTK_ALIGN_START);
update_download_icon (widget);
gtk_grid_attach (GTK_GRID (grid), widget->icon, 0, 0, 1, 1);
gtk_widget_show (widget->icon);
widget->filename = gtk_label_new (NULL);
gtk_widget_set_hexpand (widget->filename, true);
- gtk_widget_set_valign (widget->filename, GTK_ALIGN_CENTER);
gtk_label_set_xalign (GTK_LABEL (widget->filename), 0);
gtk_label_set_max_width_chars (GTK_LABEL (widget->filename), 30);
gtk_label_set_ellipsize (GTK_LABEL (widget->filename), PANGO_ELLIPSIZE_END);
@@ -403,7 +401,6 @@ ephy_download_widget_constructed (GObject *object)
gtk_widget_show (widget->filename);
widget->progress = gtk_progress_bar_new ();
- gtk_widget_set_valign (widget->progress, GTK_ALIGN_CENTER);
gtk_widget_set_margin_top (widget->progress, 6);
gtk_widget_set_margin_bottom (widget->progress, 6);
gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (widget->progress), 0.05);
@@ -412,7 +409,6 @@ ephy_download_widget_constructed (GObject *object)
gtk_widget_show (widget->progress);
widget->status = gtk_label_new (NULL);
- gtk_widget_set_valign (widget->status, GTK_ALIGN_CENTER);
gtk_label_set_xalign (GTK_LABEL (widget->status), 0);
g_object_set (widget->status, "width-request", 260, NULL);
gtk_label_set_max_width_chars (GTK_LABEL (widget->status), 30);
diff --git a/lib/widgets/ephy-downloads-progress-icon.c b/lib/widgets/ephy-downloads-progress-icon.c
index 376a34480..3a2eb1b8e 100644
--- a/lib/widgets/ephy-downloads-progress-icon.c
+++ b/lib/widgets/ephy-downloads-progress-icon.c
@@ -84,8 +84,6 @@ static void
ephy_downloads_progress_icon_init (EphyDownloadsProgressIcon *icon)
{
g_object_set (icon, "width-request", 16, "height-request", 16, NULL);
- gtk_widget_set_valign (GTK_WIDGET (icon), GTK_ALIGN_CENTER);
- gtk_widget_set_halign (GTK_WIDGET (icon), GTK_ALIGN_CENTER);
}
GtkWidget *
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 3e8ba964d..cb626f351 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -1120,7 +1120,6 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry)
entry->reader_mode_button = gtk_button_new_from_icon_name (NULL, GTK_ICON_SIZE_MENU);
gtk_widget_set_tooltip_text (entry->reader_mode_button, _("Toggle reader mode"));
entry->reader_mode_icon = gtk_button_get_image (GTK_BUTTON (entry->reader_mode_button));
- gtk_widget_set_valign (entry->reader_mode_icon, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box), entry->reader_mode_button, FALSE, TRUE, 0);
context = gtk_widget_get_style_context (entry->reader_mode_icon);
@@ -1134,7 +1133,6 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry)
entry->bookmark_button = gtk_button_new_from_icon_name ("non-starred-symbolic", GTK_ICON_SIZE_MENU);
gtk_widget_set_tooltip_text (entry->bookmark_button, _("Bookmark this page"));
entry->bookmark_icon = gtk_button_get_image (GTK_BUTTON (entry->bookmark_button));
- gtk_widget_set_valign (entry->bookmark_icon, GTK_ALIGN_CENTER);
g_signal_connect (G_OBJECT (entry->bookmark_button), "clicked", G_CALLBACK
(bookmark_icon_button_clicked_cb), entry);
gtk_box_pack_start (GTK_BOX (box), entry->bookmark_button, FALSE, TRUE, 0);
diff --git a/lib/widgets/ephy-security-popover.c b/lib/widgets/ephy-security-popover.c
index 78318175e..f1be1a4dd 100644
--- a/lib/widgets/ephy-security-popover.c
+++ b/lib/widgets/ephy-security-popover.c
@@ -247,7 +247,6 @@ ephy_security_popover_constructed (GObject *object)
certificate_button = gtk_button_new_with_mnemonic (_("_View Certificate…"));
gtk_widget_set_halign (certificate_button, GTK_ALIGN_END);
- gtk_widget_set_valign (certificate_button, GTK_ALIGN_END);
gtk_widget_set_margin_top (certificate_button, 5);
gtk_widget_set_receives_default (certificate_button, FALSE);
gtk_widget_show (certificate_button);
@@ -539,7 +538,6 @@ ephy_security_popover_init (EphySecurityPopover *popover)
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
- gtk_widget_set_hexpand (box, TRUE);
popover->lock_image = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (box), popover->lock_image, FALSE, TRUE, 0);
diff --git a/lib/widgets/ephy-title-box.c b/lib/widgets/ephy-title-box.c
index df70145bd..8eecbfc5e 100644
--- a/lib/widgets/ephy-title-box.c
+++ b/lib/widgets/ephy-title-box.c
@@ -82,6 +82,7 @@ ephy_title_box_constructed (GObject *object)
G_OBJECT_CLASS (ephy_title_box_parent_class)->constructed (object);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (title_box), vbox);
title_box->title = gtk_label_new (NULL);
@@ -248,7 +249,5 @@ ephy_title_box_init (EphyTitleBox *title_box)
EphyTitleBox *
ephy_title_box_new (void)
{
- return g_object_new (EPHY_TYPE_TITLE_BOX,
- "valign", GTK_ALIGN_CENTER,
- NULL);
+ return g_object_new (EPHY_TYPE_TITLE_BOX, NULL);
}
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index ebe83f3cc..65ebccb80 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -235,7 +235,6 @@ create_tag_row (const char *tag)
g_object_set (G_OBJECT (row), "height-request", 40, NULL);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_widget_set_halign (box, GTK_ALIGN_START);
if (g_strcmp0 (tag, EPHY_BOOKMARKS_FAVORITES_TAG) == 0) {
image = gtk_image_new_from_icon_name ("emblem-favorite-symbolic", GTK_ICON_SIZE_MENU);
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index 14e993782..85ed3356c 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -278,7 +278,6 @@ ephy_header_bar_constructed (GObject *object)
/* Fullscreen restore button */
header_bar->restore_button = gtk_button_new_from_icon_name ("view-restore-symbolic",
GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_valign (header_bar->restore_button, GTK_ALIGN_CENTER);
g_signal_connect_object (header_bar->restore_button, "clicked",
G_CALLBACK (restore_button_clicked_cb),
header_bar, 0);
@@ -290,7 +289,6 @@ ephy_header_bar_constructed (GObject *object)
header_bar->page_menu_button = button;
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_icon_name ("open-menu-symbolic", GTK_ICON_SIZE_BUTTON));
- gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
g_type_ensure (G_TYPE_THEMED_ICON);
builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/page-menu-popover.ui");
header_bar->page_menu_popover = GTK_WIDGET (gtk_builder_get_object (builder, "page-menu-popover"));
diff --git a/src/resources/gtk/action-bar-end.ui b/src/resources/gtk/action-bar-end.ui
index 1e8dfd743..1a414667e 100644
--- a/src/resources/gtk/action-bar-end.ui
+++ b/src/resources/gtk/action-bar-end.ui
@@ -5,8 +5,6 @@
<child>
<object class="GtkButtonBox" id="browser_action_box">
<property name="visible">True</property>
- <property name="valign">center</property>
- <property name="halign">end</property>
<property name="homogeneous">False</property>
<property name="layout-style">expand</property>
</object>
@@ -21,7 +19,6 @@
<property name="tooltip_text" translatable="yes">View downloads</property>
<property name="visible">True</property>
<property name="receives_default">True</property>
- <property name="valign">center</property>
<child>
<object class="GtkOverlay">
<property name="visible">True</property>
@@ -56,7 +53,6 @@
<child>
<object class="GtkButton" id="bookmark_button">
<property name="visible">True</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the bookmark button -->
<property name="tooltip_text" translatable="yes">Bookmark page</property>
<child>
@@ -74,7 +70,6 @@
<child>
<object class="GtkMenuButton" id="bookmarks_button">
<property name="visible">True</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the bookmarks popover button -->
<property name="tooltip_text" translatable="yes">View and manage your bookmarks</property>
<property name="popover">bookmarks_popover</property>
diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui
index e604b9601..3c8b22a10 100644
--- a/src/resources/gtk/action-bar-start.ui
+++ b/src/resources/gtk/action-bar-start.ui
@@ -14,7 +14,6 @@
<object class="GtkButton" id="navigation_back">
<property name="visible">True</property>
<property name="action-name">toolbar.navigation-back</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the back button -->
<property name="tooltip_text" translatable="yes">Go back to the previous page</property>
<style>
@@ -33,7 +32,6 @@
<object class="GtkButton" id="navigation_forward">
<property name="visible">True</property>
<property name="action-name">toolbar.navigation-forward</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the forward button -->
<property name="tooltip_text" translatable="yes">Go forward to the next page</property>
<style>
@@ -54,7 +52,6 @@
<object class="GtkButton" id="combined_stop_reload_button">
<property name="visible">True</property>
<property name="action-name">toolbar.combined-stop-reload</property>
- <property name="valign">center</property>
<style>
<class name="image-button"/>
</style>
@@ -71,7 +68,6 @@
<object class="GtkButton" id="homepage_button">
<property name="visible">True</property>
<property name="action-name">win.home</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the secret homepage button -->
<property name="tooltip_text" translatable="yes">Go to your homepage</property>
<style>
@@ -90,7 +86,6 @@
<object class="GtkButton" id="new_tab_button">
<property name="visible">True</property>
<property name="action-name">win.new-tab</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the new tab button -->
<property name="tooltip_text" translatable="yes">Open a new tab</property>
<style>
diff --git a/src/resources/gtk/action-bar.ui b/src/resources/gtk/action-bar.ui
index 8afff45a2..102cd5f71 100644
--- a/src/resources/gtk/action-bar.ui
+++ b/src/resources/gtk/action-bar.ui
@@ -19,7 +19,6 @@
<child>
<object class="EphyPagesButton" id="pages_button">
<property name="visible">True</property>
- <property name="valign">center</property>
<!-- Translators: tooltip for the page switcher button -->
<property name="tooltip_text" translatable="yes">View open pages</property>
<property name="action_name">win.tabs-view</property>
diff --git a/src/resources/gtk/bookmark-properties.ui b/src/resources/gtk/bookmark-properties.ui
index 304050221..f13a04fb5 100644
--- a/src/resources/gtk/bookmark-properties.ui
+++ b/src/resources/gtk/bookmark-properties.ui
@@ -19,7 +19,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Name</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">name_entry</property>
@@ -37,8 +37,7 @@
<child>
<object class="GtkLabel" id="address_label">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
+ <property name="xalign">0</property>
<property name="margin_top">6</property>
<property name="label" translatable="yes">_Address</property>
<property name="use-underline">True</property>
@@ -56,8 +55,7 @@
<child>
<object class="GtkLabel" id="popover_tags_label">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
+ <property name="xalign">0</property>
<property name="margin_top">12</property>
<property name="label" translatable="yes">Tags</property>
<style>
diff --git a/src/resources/gtk/bookmark-row.ui b/src/resources/gtk/bookmark-row.ui
index 2800e6f9f..2c6a18821 100644
--- a/src/resources/gtk/bookmark-row.ui
+++ b/src/resources/gtk/bookmark-row.ui
@@ -17,7 +17,6 @@
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
- <property name="halign">fill</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
<property name="max_width_chars">1</property>
diff --git a/src/resources/gtk/bookmarks-popover.ui b/src/resources/gtk/bookmarks-popover.ui
index 8d869ca80..75a81790c 100644
--- a/src/resources/gtk/bookmarks-popover.ui
+++ b/src/resources/gtk/bookmarks-popover.ui
@@ -21,7 +21,6 @@
<property name="visible">true</property>
<child>
<object class="GtkStackSwitcher">
- <property name="hexpand">true</property>
<property name="halign">center</property>
<property name="stack">stack</property>
<property name="visible">true</property>
diff --git a/src/resources/gtk/clear-data-view.ui b/src/resources/gtk/clear-data-view.ui
index c81e1295e..16d94f47f 100644
--- a/src/resources/gtk/clear-data-view.ui
+++ b/src/resources/gtk/clear-data-view.ui
@@ -54,7 +54,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Clear selected personal data:</property>
<property name="use-underline">True</property>
- <property name="halign">start</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
<property name="justify">left</property>
diff --git a/src/resources/gtk/data-view.ui b/src/resources/gtk/data-view.ui
index c208a96db..d46584ff7 100644
--- a/src/resources/gtk/data-view.ui
+++ b/src/resources/gtk/data-view.ui
@@ -56,17 +56,13 @@
<child>
<object class="HdySearchBar" id="search_bar">
<property name="visible">True</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
<property name="search_mode_enabled">False</property>
<child>
<object class="HdyClamp">
<property name="visible">True</property>
- <property name="hexpand">True</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="visible">True</property>
- <property name="hexpand">True</property>
<property name="primary_icon_name">edit-find-symbolic</property>
<property name="primary_icon_activatable">False</property>
<property name="primary_icon_sensitive">False</property>
diff --git a/src/resources/gtk/encoding-dialog.ui b/src/resources/gtk/encoding-dialog.ui
index 1fb96fb41..a13d599b7 100644
--- a/src/resources/gtk/encoding-dialog.ui
+++ b/src/resources/gtk/encoding-dialog.ui
@@ -29,7 +29,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="margin_left">6</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Use the encoding specified by the
document</property>
@@ -64,7 +64,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="margin_start">8</property>
<property name="label" translatable="yes">Recent encodings</property>
<attributes>
@@ -96,7 +96,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="margin_start">8</property>
<property name="label" translatable="yes">Related encodings</property>
<attributes>
diff --git a/src/resources/gtk/firefox-sync-dialog.ui b/src/resources/gtk/firefox-sync-dialog.ui
index 416ac1e85..7011a4264 100644
--- a/src/resources/gtk/firefox-sync-dialog.ui
+++ b/src/resources/gtk/firefox-sync-dialog.ui
@@ -35,7 +35,7 @@
<child>
<object class="GtkLabel" id="sync_firefox_iframe_label">
<property name="visible">False</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
</object>
</child>
</object>
diff --git a/src/resources/gtk/history-dialog.ui b/src/resources/gtk/history-dialog.ui
index 4d8d02dc9..89830749b 100644
--- a/src/resources/gtk/history-dialog.ui
+++ b/src/resources/gtk/history-dialog.ui
@@ -126,19 +126,15 @@
<child>
<object class="HdySearchBar" id="search_bar">
<property name="visible">True</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
<property name="search_mode_enabled">False</property>
<child>
<object class="HdyClamp">
<property name="visible">True</property>
- <property name="hexpand">True</property>
<property name="maximum_size">400</property>
<property name="tightening_threshold">300</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="visible">True</property>
- <property name="hexpand">True</property>
<property name="placeholder-text" translatable="yes">Search history</property>
<property name="primary_icon_name">edit-find-symbolic</property>
<property name="primary_icon_activatable">False</property>
diff --git a/src/resources/gtk/lang-row.ui b/src/resources/gtk/lang-row.ui
index 8eb3307d9..09318894c 100644
--- a/src/resources/gtk/lang-row.ui
+++ b/src/resources/gtk/lang-row.ui
@@ -35,7 +35,7 @@
<child>
<object class="GtkButton" id="delete_button">
<property name="visible">True</property>
- <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="valign">center</property>
<property name="tooltip-text" translatable="yes">Delete language</property>
<signal name="clicked" handler="on_delete_button_clicked"/>
<child>
diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
index b8ba9d454..0e1b5b786 100644
--- a/src/resources/gtk/page-menu-popover.ui
+++ b/src/resources/gtk/page-menu-popover.ui
@@ -35,7 +35,6 @@
<object class="GtkButton">
<property name="tooltip_text" translatable="yes">Restore Zoom</property>
<property name="action-name">win.zoom-normal</property>
- <property name="xalign">0.5</property>
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="zoom-level">
diff --git a/src/resources/gtk/page-row.ui b/src/resources/gtk/page-row.ui
index c1581efa3..72ab0780b 100644
--- a/src/resources/gtk/page-row.ui
+++ b/src/resources/gtk/page-row.ui
@@ -38,8 +38,6 @@
<child>
<object class="GtkLabel" id="title">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
<property name="margin_start">4</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
@@ -61,7 +59,6 @@
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Close page</property>
- <property name="halign">end</property>
<property name="valign">center</property>
<property name="relief">none</property>
<signal name="clicked" handler="close_clicked_cb" swapped="yes"/>
diff --git a/src/resources/gtk/pages-button.ui b/src/resources/gtk/pages-button.ui
index 6b57c2236..b08d4c320 100644
--- a/src/resources/gtk/pages-button.ui
+++ b/src/resources/gtk/pages-button.ui
@@ -13,8 +13,6 @@
<child type="overlay">
<object class="GtkLabel" id="pages_label">
<property name="visible">True</property>
- <property name="halign">center</property>
- <property name="justify">center</property>
<property name="width-chars">2</property>
<attributes>
<attribute name="font-features" value="tnum=1"/>
diff --git a/src/resources/gtk/prefs-lang-dialog.ui b/src/resources/gtk/prefs-lang-dialog.ui
index 269b0c3e0..0fa1bc561 100644
--- a/src/resources/gtk/prefs-lang-dialog.ui
+++ b/src/resources/gtk/prefs-lang-dialog.ui
@@ -17,7 +17,6 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="valign">center</property>
</object>
</child>
<child type="action">
@@ -27,7 +26,6 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="valign">center</property>
</object>
</child>
<child internal-child="vbox">
@@ -50,7 +48,7 @@
<child>
<object class="GtkLabel" id="label1309">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Choose a language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">languages_treeview</property>
diff --git a/src/resources/gtk/search-engine-listbox.ui b/src/resources/gtk/search-engine-listbox.ui
index 04fd014b0..094819bb5 100644
--- a/src/resources/gtk/search-engine-listbox.ui
+++ b/src/resources/gtk/search-engine-listbox.ui
@@ -13,8 +13,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
<property name="label" translatable="yes">A_dd Search Engine…</property>
<property name="use-underline">True</property>
</object>
diff --git a/src/resources/gtk/search-engine-row.ui b/src/resources/gtk/search-engine-row.ui
index 37dba017b..2656603bf 100644
--- a/src/resources/gtk/search-engine-row.ui
+++ b/src/resources/gtk/search-engine-row.ui
@@ -7,7 +7,6 @@
<object class="GtkRadioButton" id="radio_button">
<property name="visible">True</property>
<property name="valign">center</property>
- <property name="halign">center</property>
<property name="tooltip-text" translatable="yes">Selects the default search engine</property>
<signal name="clicked" handler="on_radio_button_clicked_cb" object="EphySearchEngineRow"
swapped="yes"/>
</object>
@@ -30,7 +29,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Name</property>
- <property name="halign">end</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -52,7 +51,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Address</property>
- <property name="halign">end</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -78,7 +77,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Shortcut</property>
- <property name="halign">end</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -123,7 +122,6 @@
<object class="GtkButton" id="remove_button">
<property name="visible">True</property>
<property name="halign">end</property>
- <property name="hexpand">False</property>
<property name="label" translatable="yes">R_emove Search Engine</property>
<property name="use-underline">True</property>
diff --git a/src/resources/gtk/synced-tabs-dialog.ui b/src/resources/gtk/synced-tabs-dialog.ui
index 8c6251f9c..e59de2c28 100644
--- a/src/resources/gtk/synced-tabs-dialog.ui
+++ b/src/resources/gtk/synced-tabs-dialog.ui
@@ -32,7 +32,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="wrap">True</property>
<property name="max-width-chars">50</property>
<property name="label" translatable="yes">Below are the synced open tabs of your other devices
that use Firefox Sync with this account. Open a tab by double clicking its name (tabs under Local Tabs cannot
be opened).</property>
diff --git a/src/resources/gtk/webapp-additional-urls-dialog.ui
b/src/resources/gtk/webapp-additional-urls-dialog.ui
index cb9c09127..8eeae0995 100644
--- a/src/resources/gtk/webapp-additional-urls-dialog.ui
+++ b/src/resources/gtk/webapp-additional-urls-dialog.ui
@@ -20,7 +20,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="halign">start</property>
+ <property name="xalign">0</property>
<property name="margin">12</property>
<property name="label" translatable="yes">A URL that starts with any of the additional URLs will
be opened by the web application. If you omit the URL scheme, the one from the currently loaded URL will be
used.</property>
<property name="wrap">True</property>
@@ -101,7 +101,6 @@
<property name="label" translatable="yes">C_lear All</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
- <property name="valign">center</property>
<property name="action-name">webapp-additional-urls.forget-all</property>
<accelerator key="Delete" modifiers="GDK_SHIFT_MASK" signal="clicked"/>
<style>
diff --git a/src/webextension/ephy-web-extension-manager.c b/src/webextension/ephy-web-extension-manager.c
index 3ff9ca32d..4aaa9f9fe 100644
--- a/src/webextension/ephy-web-extension-manager.c
+++ b/src/webextension/ephy-web-extension-manager.c
@@ -675,9 +675,6 @@ create_browser_popup (EphyWebExtension *web_extension)
web_view = create_web_extensions_webview (web_extension, TRUE);
- gtk_widget_set_hexpand (web_view, TRUE);
- gtk_widget_set_vexpand (web_view, TRUE);
-
popup = ephy_web_extension_get_browser_popup (web_extension);
dir_name = g_path_get_dirname (popup);
base_uri = g_strdup_printf ("ephy-webextension:///%s/", dir_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
