callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text: Add a way to override direction

Browse Source 
Add a Ctrl+Shift+T shortcut to toggle the widgets direction,
to give the user control in the rare cases where a different
direction is appropriate.

This is a backport of 0b33abe44b4f42cba (without the context
menu item, since that needs new strings).
This commit is contained in:
Matthias Clasen 2025-01-24 12:17:31 -05:00
parent 5c6f33d1f3
commit c4c3e01849
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gtk/gtkentry.c
View File

@ -328,6 +328,7 @@ enum {
ICON_RELEASE, ICON_RELEASE,
PREEDIT_CHANGED, PREEDIT_CHANGED,
INSERT_EMOJI, INSERT_EMOJI,
TOGGLE_DIRECTION,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -553,6 +554,7 @@ static void gtk_entry_cut_clipboard (GtkEntry *entry);
static void gtk_entry_copy_clipboard (GtkEntry *entry); static void gtk_entry_copy_clipboard (GtkEntry *entry);
static void gtk_entry_paste_clipboard (GtkEntry *entry); static void gtk_entry_paste_clipboard (GtkEntry *entry);
static void gtk_entry_toggle_overwrite (GtkEntry *entry); static void gtk_entry_toggle_overwrite (GtkEntry *entry);
static void gtk_entry_toggle_direction (GtkEntry *entry);
static void gtk_entry_insert_emoji (GtkEntry *entry); static void gtk_entry_insert_emoji (GtkEntry *entry);
static void gtk_entry_select_all (GtkEntry *entry); static void gtk_entry_select_all (GtkEntry *entry);
static void gtk_entry_real_activate (GtkEntry *entry); static void gtk_entry_real_activate (GtkEntry *entry);
@ -819,6 +821,7 @@ gtk_entry_class_init (GtkEntryClass *class)
class->activate = gtk_entry_real_activate; class->activate = gtk_entry_real_activate;
class->get_text_area_size = gtk_entry_get_text_area_size; class->get_text_area_size = gtk_entry_get_text_area_size;
class->get_frame_size = gtk_entry_get_frame_size; class->get_frame_size = gtk_entry_get_frame_size;
class->toggle_direction = gtk_entry_toggle_direction;
quark_inner_border = g_quark_from_static_string ("gtk-entry-inner-border"); quark_inner_border = g_quark_from_static_string ("gtk-entry-inner-border");
quark_password_hint = g_quark_from_static_string ("gtk-entry-password-hint"); quark_password_hint = g_quark_from_static_string ("gtk-entry-password-hint");
@ -1845,6 +1848,15 @@ gtk_entry_class_init (GtkEntryClass *class)
NULL, NULL,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[TOGGLE_DIRECTION] =
g_signal_new (I_("toggle-direction"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkEntryClass, toggle_direction),
NULL, NULL,
NULL,
G_TYPE_NONE, 0);
/** /**
* GtkEntry::icon-press: * GtkEntry::icon-press:
* @entry: The entry on which the signal is emitted * @entry: The entry on which the signal is emitted
@ -2099,6 +2111,8 @@ gtk_entry_class_init (GtkEntryClass *class)
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0, gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0,
"toggle-overwrite", 0); "toggle-overwrite", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_t, GDK_CONTROL_MASK|GDK_SHIFT_MASK,
"toggle-direction", 0);
/** /**
* GtkEntry:inner-border: * GtkEntry:inner-border:
* *
@ -6021,6 +6035,34 @@ gtk_entry_toggle_overwrite (GtkEntry *entry)
gtk_widget_queue_draw (GTK_WIDGET (entry)); gtk_widget_queue_draw (GTK_WIDGET (entry));
} }
static void
update_resolved_dir (GtkEntry *self)
{
GtkEntryPrivate *priv = self->priv;
if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
priv->resolved_dir = PANGO_DIRECTION_RTL;
else
priv->resolved_dir = PANGO_DIRECTION_LTR;
}
static void
gtk_entry_toggle_direction (GtkEntry *entry)
{
GtkWidget *widget = GTK_WIDGET (entry);
GtkEntryPrivate *priv = entry->priv;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
gtk_widget_set_direction (widget, GTK_TEXT_DIR_LTR);
else
gtk_widget_set_direction (widget, GTK_TEXT_DIR_RTL);
update_resolved_dir (entry);
if (priv->cached_layout)
pango_layout_context_changed (priv->cached_layout);
}
static void static void
gtk_entry_select_all (GtkEntry *entry) gtk_entry_select_all (GtkEntry *entry)
{ {
@ -6316,17 +6358,6 @@ show_placeholder_text (GtkEntry *entry)
return FALSE; return FALSE;
} }
static void
update_resolved_dir (GtkEntry *self)
{
GtkEntryPrivate *priv = self->priv;
if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
priv->resolved_dir = PANGO_DIRECTION_RTL;
else
priv->resolved_dir = PANGO_DIRECTION_LTR;
}
static PangoLayout * static PangoLayout *
gtk_entry_create_layout (GtkEntry *entry, gtk_entry_create_layout (GtkEntry *entry,
gboolean include_preedit) gboolean include_preedit)

3
gtk/gtkentry.h
View File

@ -162,13 +162,14 @@ struct _GtkEntryClass
/*< private >*/ /*< private >*/
void (* toggle_direction) (GtkEntry *entry);
/* Padding for future expansion */ /* Padding for future expansion */
void (*_gtk_reserved1) (void); void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void); void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void); void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void); void (*_gtk_reserved4) (void);
void (*_gtk_reserved5) (void); void (*_gtk_reserved5) (void);
void (*_gtk_reserved6) (void);
}; };
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL