From cd0fd30e696786e3e782d51ca1bad6bb9a26b0f8 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 6 Jul 2023 15:24:51 +0200 Subject: [PATCH] Show login page after choosing an instance --- src/components/instances_page.rs | 2 +- src/components/login_page.rs | 2 +- src/components/posts_page.rs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/instances_page.rs b/src/components/instances_page.rs index d013c7c..3db1da6 100644 --- a/src/components/instances_page.rs +++ b/src/components/instances_page.rs @@ -128,7 +128,7 @@ impl SimpleComponent for InstancesPage { current_account.instance_url = url[0..url.len() - 1].to_string(); current_account.jwt = None; settings::update_current_account(current_account); - crate::AppMsg::OpenPosts + crate::AppMsg::ShowLogin } Err(err) => crate::AppMsg::ShowMessage(err.to_string()), }; diff --git a/src/components/login_page.rs b/src/components/login_page.rs index f612be1..7636a07 100644 --- a/src/components/login_page.rs +++ b/src/components/login_page.rs @@ -50,7 +50,7 @@ impl SimpleComponent for LoginPage { set_orientation: gtk::Orientation::Horizontal, set_halign: gtk::Align::End, gtk::Button { - set_label: "Cancel", + set_label: "Cancel/Skip", connect_clicked => LoginPageInput::Cancel, set_margin_end: 10, }, diff --git a/src/components/posts_page.rs b/src/components/posts_page.rs index 69a77a2..137bd45 100644 --- a/src/components/posts_page.rs +++ b/src/components/posts_page.rs @@ -63,7 +63,8 @@ impl SimpleComponent for PostsPage { gtk::Button { set_label: "More", connect_clicked => PostsPageInput::FetchPosts(model.posts_type, false), - set_margin_all: 10, + set_margin_top: 10, + set_margin_bottom: 10, } } }