Skip to content

Commit 2feb651

Browse files
authored
Merge pull request #249 from toolstack/avoid-sidebar-reopening
Avoid the sidebar being opened during a save.
2 parents 92b30f2 + 53eed2c commit 2feb651

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

src/ui/window/window.vala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public class Folio.Window : Adw.ApplicationWindow {
399399
public void update_note_sort_order () {
400400
var settings = new Settings (Config.APP_ID);
401401
var notebook = window_model.notebook;
402-
if (notebook != null) {
402+
if (notebook != null && !is_sidebar_hidden ()) {
403403
notebook.sort_notes (settings.get_int ("note-sort-order"));
404404
notebook_notes_list.model = null;
405405
notebook_notes_list.model = window_model.notes_model;
@@ -450,16 +450,19 @@ public class Folio.Window : Adw.ApplicationWindow {
450450
edit_view.is_editable = window_model.note != null && window_model.state == WindowModel.State.NOTEBOOK;
451451
}
452452

453+
private bool is_sidebar_hidden() {
454+
return leaflet.collapsed || !sidebar_revealer.reveal_child;
455+
456+
}
457+
453458
private void update_title_buttons () {
454-
var is_sidebar_hidden = leaflet.collapsed || !sidebar_revealer.reveal_child;
455-
headerbar_edit_view.show_start_title_buttons = is_sidebar_hidden;
459+
headerbar_edit_view.show_start_title_buttons = is_sidebar_hidden ();
456460
update_note_title ();
457461
}
458462

459463
private void update_note_title () {
460-
var is_sidebar_hidden = leaflet.collapsed || !sidebar_revealer.reveal_child;
461464
var note = window_model.note;
462-
var show = is_sidebar_hidden && note != null;
465+
var show = is_sidebar_hidden () && note != null;
463466
note_subtitle.label = show ? note.notebook.name : null;
464467
note_subtitle.visible = show;
465468
}

0 commit comments

Comments
 (0)