Skip to content

Fix card switching #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Nov 10, 2025
+24 −30
Merged

Fix card switching #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3025b
Fix card switching
lenemter Nov 7, 2025
e5c5f98
Merge branch 'main' into lenemter/fix-switching-cards
danirabbit Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/Cards/UserCard.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
public class Greeter.UserCard : Greeter.BaseCard {
public signal void go_left ();
public signal void go_right ();
public signal void focus_requested ();

public LightDM.User lightdm_user { get; construct; }
public bool show_input { get; set; default = false; }
public bool is_24h { get; set; default = true; }
// TODO: In Gtk4 remove this gesture and move it to MainWindow
public Gtk.GestureMultiPress click_gesture { get; private set; }

private Act.User act_user;
private Pantheon.AccountsService greeter_act;
private Pantheon.SettingsDaemon.AccountsService settings_act;

private Gtk.GestureMultiPress click_gesture;
private Gtk.Revealer form_revealer;
private Gtk.Stack login_stack;
private Greeter.PasswordEntry password_entry;
Expand Down Expand Up @@ -202,12 +202,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
});

click_gesture = new Gtk.GestureMultiPress (this);
click_gesture.pressed.connect ((n_press, x, y) => {
if (!show_input) {
focus_requested ();
password_entry.grab_focus ();
}
});

notify["show-input"].connect (update_collapsed_class);

Expand Down
44 changes: 22 additions & 22 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
private Greeter.DateTimeWidget datetime_widget;
private unowned LightDM.UserList lightdm_user_list;

private int current_user_card_index = 0;
private int current_user_card_index = -1;
private unowned Greeter.BaseCard? current_card = null;

private bool installer_mode = false;
Expand Down Expand Up @@ -180,13 +180,7 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
return Gdk.EVENT_PROPAGATE;
});

carousel.page_changed.connect ((index) => {
var children = carousel.get_children ();

if (children.nth_data (index) is Greeter.UserCard) {
current_user_card_index = (int) index;
}
});
carousel.page_changed.connect (handle_page_changed);

load_users.begin (() => {
/* A significant delay is required in order for the window and card to be focused at
Expand Down Expand Up @@ -367,15 +361,15 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
bool user_selected = false;
user_cards.head.foreach ((card) => {
if (card.lightdm_user.name == user_to_select) {
switch_to_card (card);
carousel.scroll_to (card);
user_selected = true;
}
});

if (!user_selected) {
unowned var user_card = user_cards.peek_head ();
user_card.show_input = true;
switch_to_card (user_card);
carousel.scroll_to (user_card);
}
} else {
datetime_revealer.reveal_child = false;
Expand Down Expand Up @@ -408,21 +402,23 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
private void add_card (LightDM.User lightdm_user) {
var user_card = new Greeter.UserCard (lightdm_user);
user_card.show_all ();
user_card.do_connect.connect (do_connect);
user_card.click_gesture.pressed.connect ((gesture, n_press, x, y) => {
assert (gesture.widget is UserCard);

carousel.add (user_card);

user_card.focus_requested.connect (() => {
switch_to_card (user_card);
var _user_card = (UserCard) gesture.widget;
if (!_user_card.show_input) {
carousel.scroll_to (_user_card);
_user_card.grab_focus ();
}
});

user_card.go_left.connect (() => {
if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
go_previous ();
} else {
go_next ();
}
});

user_card.go_right.connect (() => {
if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
go_next ();
Expand All @@ -431,26 +427,30 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
}
});

user_card.do_connect.connect (do_connect);
carousel.add (user_card);

card_size_group.add_widget (user_card);
user_cards.push_tail (user_card);
}

private void switch_to_card (Greeter.UserCard user_card) {
if (!carousel.interactive) {
private void handle_page_changed (uint index) {
if (index == current_user_card_index) {
return;
}

unowned var user_card = user_cards.peek_nth (index);
if (user_card == null) {
return;
}

if (current_card != null && current_card is UserCard) {
((UserCard) current_card).show_input = false;
}

datetime_widget.is_24h = user_card.is_24h;

current_user_card_index = (int) index;
current_card = user_card;

carousel.scroll_to (user_card);
datetime_widget.is_24h = user_card.is_24h;

user_card.set_settings ();
user_card.show_input = true;
Expand Down