[gnome-shell] st-entry: Remove caps-lock feedback warning
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] st-entry: Remove caps-lock feedback warning
- Date: Tue, 17 Dec 2019 22:18:16 +0000 (UTC)
commit df230989b193bb0541daaebb7a6517099349b957
Author: Umang Jain <mailumangjain gmail com>
Date: Fri Dec 13 18:07:57 2019 +0530
st-entry: Remove caps-lock feedback warning
This frees the entry's secondary icon that for other uses.
Caps-lock-warning feedback has been moved to be shown in
the various dialogs instead in the password-entries itself.
StPasswordEntry can now use a peek-password icon as the
secondary icon to show/hide the password present in the
entry.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/619
src/st/st-entry.c | 74 -------------------------------------------------------
1 file changed, 74 deletions(-)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index cb75273b5d..feb90647bc 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -110,7 +110,6 @@ struct _StEntryPrivate
gfloat spacing;
- gboolean capslock_warning_shown;
gboolean has_ibeam;
CoglPipeline *text_shadow_material;
@@ -216,61 +215,14 @@ st_entry_get_property (GObject *gobject,
}
}
-static void
-show_capslock_feedback (StEntry *entry)
-{
- StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
- if (priv->secondary_icon == NULL)
- {
- ClutterActor *icon = g_object_new (ST_TYPE_ICON,
- "style-class", "capslock-warning",
- "icon-name", "dialog-warning-symbolic",
- NULL);
-
- st_entry_set_secondary_icon (entry, icon);
- priv->capslock_warning_shown = TRUE;
- }
-}
-
-static void
-remove_capslock_feedback (StEntry *entry)
-{
- StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
- if (priv->capslock_warning_shown)
- {
- st_entry_set_secondary_icon (entry, NULL);
- priv->capslock_warning_shown = FALSE;
- }
-}
-
-static void
-keymap_state_changed (ClutterKeymap *keymap,
- gpointer user_data)
-{
- StEntry *entry = ST_ENTRY (user_data);
- StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
-
- if (clutter_text_get_password_char (CLUTTER_TEXT (priv->entry)) != 0)
- {
- if (clutter_keymap_get_caps_lock_state (keymap))
- show_capslock_feedback (entry);
- else
- remove_capslock_feedback (entry);
- }
-}
-
static void
st_entry_dispose (GObject *object)
{
StEntry *entry = ST_ENTRY (object);
StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
- ClutterKeymap *keymap;
cogl_clear_object (&priv->text_shadow_material);
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
- g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
-
G_OBJECT_CLASS (st_entry_parent_class)->dispose (object);
}
@@ -568,15 +520,9 @@ clutter_text_focus_in_cb (ClutterText *text,
ClutterActor *actor)
{
StEntry *entry = ST_ENTRY (actor);
- ClutterKeymap *keymap;
st_entry_update_hint_visibility (entry);
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
- keymap_state_changed (keymap, entry);
- g_signal_connect (keymap, "state-changed",
- G_CALLBACK (keymap_state_changed), entry);
-
st_widget_add_style_pseudo_class (ST_WIDGET (actor), "focus");
clutter_text_set_cursor_visible (text, TRUE);
}
@@ -586,29 +532,12 @@ clutter_text_focus_out_cb (ClutterText *text,
ClutterActor *actor)
{
StEntry *entry = ST_ENTRY (actor);
- ClutterKeymap *keymap;
st_widget_remove_style_pseudo_class (ST_WIDGET (actor), "focus");
st_entry_update_hint_visibility (entry);
clutter_text_set_cursor_visible (text, FALSE);
- remove_capslock_feedback (entry);
-
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
- g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
-}
-
-static void
-clutter_text_password_char_cb (GObject *object,
- GParamSpec *pspec,
- gpointer user_data)
-{
- StEntry *entry = ST_ENTRY (user_data);
- StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
-
- if (clutter_text_get_password_char (CLUTTER_TEXT (priv->entry)) == 0)
- remove_capslock_feedback (entry);
}
static void
@@ -1054,9 +983,6 @@ st_entry_init (StEntry *entry)
g_signal_connect (priv->entry, "key-focus-out",
G_CALLBACK (clutter_text_focus_out_cb), entry);
- g_signal_connect (priv->entry, "notify::password-char",
- G_CALLBACK (clutter_text_password_char_cb), entry);
-
g_signal_connect (priv->entry, "button-press-event",
G_CALLBACK (clutter_text_button_press_event), entry);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]