From 6c00520015fbdc73f24861ea83718e6a91aa3b4a Mon Sep 17 00:00:00 2001 From: Yosef Or Boczko Date: Fri, 8 Nov 2013 13:04:59 -0800 Subject: [PATCH] Fix Search box clear button for RTL: Closes #7640 --- src/client/ui/main-toolbar.vala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/ui/main-toolbar.vala b/src/client/ui/main-toolbar.vala index fbea3b8e..1c4c9494 100644 --- a/src/client/ui/main-toolbar.vala +++ b/src/client/ui/main-toolbar.vala @@ -7,6 +7,7 @@ // Draws the main toolbar. public class MainToolbar : PillToolbar { private const string ICON_CLEAR_NAME = "edit-clear-symbolic"; + private const string ICON_CLEAR_RTL_NAME = "edit-clear-rtl-symbolic"; private const string DEFAULT_SEARCH_TEXT = _("Search"); public FolderMenu copy_folder_menu { get; private set; default = new FolderMenu(); } @@ -72,7 +73,7 @@ public class MainToolbar : PillToolbar { // Search bar. search_entry.width_chars = 32; search_entry.primary_icon_name = "edit-find-symbolic"; - search_entry.secondary_icon_name = "edit-clear-symbolic"; + search_entry.secondary_icon_name = rtl ? "edit-clear-rtl-symbolic" : "edit-clear-symbolic"; search_entry.secondary_icon_activatable = true; search_entry.secondary_icon_sensitive = true; search_entry.tooltip_text = _("Search all mail in account for keywords (Ctrl+S)"); @@ -118,7 +119,8 @@ public class MainToolbar : PillToolbar { private void on_search_entry_changed() { search_text_changed(search_entry.text); // Enable/disable clear button. - search_entry.secondary_icon_name = search_entry.text != "" ? ICON_CLEAR_NAME : null; + search_entry.secondary_icon_name = search_entry.text != "" ? + (get_direction() == Gtk.TextDirection.RTL ? ICON_CLEAR_RTL_NAME : ICON_CLEAR_NAME) : null; } private void on_search_entry_icon_release(Gtk.EntryIconPosition icon_pos, Gdk.Event event) {