vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

login: Replace custom button with SpinnerButton

Browse source
This commit is contained in:
Kévin Commaille 2022-01-10 18:51:47 +01:00
parent 0f499857f4
commit bdfd69c64d
No known key found for this signature in database
GPG key ID: DD507DAE96E8245C
3 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/resources/style.css
View file

@ -27,6 +27,10 @@ listview.content row:last-child {
border-bottom-width: 0px;
}
headerbar .suggested-action {
min-width: 70px;
}
/* Components */

21
data/resources/ui/login.ui
View file

@ -19,25 +19,9 @@
</object>
</child>
<child type="end">
<object class="GtkButton" id="next_button">
<object class="SpinnerButton" id="next_button">
<property name="action_name">login.next</property>
<property name="child">
<object class="GtkStack" id="next_stack">
<child>
<object class="GtkLabel" id="next_label">
<property name="use_underline">True</property>
<property name="label" translatable="yes">_Next</property>
</object>
</child>
<child>
<object class="GtkSpinner" id="next_spinner">
<property name="spinning">True</property>
<property name="valign">center</property>
<property name="halign">center</property>
</object>
</child>
</object>
</property>
<property name="label" translatable="yes">_Next</property>
<style>
<class name="suggested-action"/>
</style>
@ -167,4 +151,3 @@
</child>
</template>
</interface>

16
src/login.rs
View file

@ -3,7 +3,7 @@ use gtk::{self, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTe
use log::debug;
use url::{ParseError, Url};
use crate::Session;
use crate::{components::SpinnerButton, Session};
mod imp {
use std::cell::RefCell;
@ -21,13 +21,7 @@ mod imp {
pub struct Login {
pub current_session: RefCell<Option<Session>>,
#[template_child]
pub next_button: TemplateChild<gtk::Button>,
#[template_child]
pub next_stack: TemplateChild<gtk::Stack>,
#[template_child]
pub next_label: TemplateChild<gtk::Label>,
#[template_child]
pub next_spinner: TemplateChild<gtk::Spinner>,
pub next_button: TemplateChild<SpinnerButton>,
#[template_child]
pub main_stack: TemplateChild<gtk::Stack>,
#[template_child]
@ -153,9 +147,7 @@ impl Login {
let priv_ = self.imp();
self.action_set_enabled("login.next", false);
priv_
.next_stack
.set_visible_child(&priv_.next_spinner.get());
priv_.next_button.set_loading(true);
priv_.main_stack.set_sensitive(false);
}
@ -163,7 +155,7 @@ impl Login {
let priv_ = self.imp();
self.action_set_enabled("login.next", true);
priv_.next_stack.set_visible_child(&priv_.next_label.get());
priv_.next_button.set_loading(false);
priv_.main_stack.set_sensitive(true);
}