anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update to libhandy 1.0

Browse source
This commit is contained in:
mimi89999 2020-10-11 21:55:07 +02:00 committed by fiaxh
parent 5e04cdde39
commit 88e3038765
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/FindHandy.cmake
View file

@ -1,7 +1,7 @@
include(PkgConfigWithFallback) include(PkgConfigWithFallback)
find_pkg_config_with_fallback(Handy find_pkg_config_with_fallback(Handy
PKG_CONFIG_NAME libhandy-0.0 PKG_CONFIG_NAME libhandy-1
LIB_NAMES libhandy-0.0 LIB_NAMES libhandy-1
INCLUDE_NAMES handy.h INCLUDE_NAMES handy.h
) )

3
main/data/unified_main_content.ui
View file

@ -4,8 +4,7 @@
<property name="orientation">horizontal</property> <property name="orientation">horizontal</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="mode-transition-type">slide</property> <property name="transition-type">slide</property>
<property name="child-transition-type">slide</property>
<child> <child>
<object class="GtkStack" id="left_stack"> <object class="GtkStack" id="left_stack">
<property name="visible">True</property> <property name="visible">True</property>

11
main/src/ui/main_window.vala
View file

@ -51,9 +51,8 @@ public class MainWindow : Gtk.Window {
setup_headerbar(); setup_headerbar();
setup_stack(); setup_stack();
paned.bind_property("mode-transition-type", headerbar_paned, "mode-transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("transition-type", headerbar_paned, "transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
paned.bind_property("mode-transition-duration", headerbar_paned, "mode-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("mode-transition-duration", headerbar_paned, "mode-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
paned.bind_property("child-transition-type", headerbar_paned, "child-transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
paned.bind_property("child-transition-duration", headerbar_paned, "child-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("child-transition-duration", headerbar_paned, "child-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
paned.bind_property("visible-child-name", headerbar_paned, "visible-child-name", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("visible-child-name", headerbar_paned, "visible-child-name", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
} }
@ -61,7 +60,7 @@ public class MainWindow : Gtk.Window {
private void setup_unified() { private void setup_unified() {
Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui"); Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
paned = (Hdy.Leaflet) builder.get_object("paned"); paned = (Hdy.Leaflet) builder.get_object("paned");
paned.notify["fold"].connect_after(() => update_headerbar()); paned.notify["folded"].connect_after(() => update_headerbar());
box.add(paned); box.add(paned);
left_stack = (Stack) builder.get_object("left_stack"); left_stack = (Stack) builder.get_object("left_stack");
right_stack = (Stack) builder.get_object("right_stack"); right_stack = (Stack) builder.get_object("right_stack");
@ -77,13 +76,13 @@ public class MainWindow : Gtk.Window {
private void update_headerbar() { private void update_headerbar() {
if (!Util.use_csd()) return; if (!Util.use_csd()) return;
conversation_titlebar_csd.back_button = headerbar_paned.fold == Hdy.Fold.FOLDED; conversation_titlebar_csd.back_button = headerbar_paned.folded;
set_window_buttons(); set_window_buttons();
} }
private void show_list_pane() { private void show_list_pane() {
paned.visible_child_name = "list-pane"; paned.visible_child_name = "list-pane";
if (headerbar_paned.fold == Hdy.Fold.FOLDED) { if (headerbar_paned.folded) {
conversation_selector.unselect_row(conversation_selector.get_selected_row()); conversation_selector.unselect_row(conversation_selector.get_selected_row());
} }
} }
@ -131,7 +130,7 @@ public class MainWindow : Gtk.Window {
Gtk.Settings? gtk_settings = Gtk.Settings.get_default(); Gtk.Settings? gtk_settings = Gtk.Settings.get_default();
if (gtk_settings == null) return; if (gtk_settings == null) return;
if (headerbar_paned.fold == Hdy.Fold.FOLDED) { if (headerbar_paned.folded) {
conversation_list_titlebar_csd.decoration_layout = gtk_settings.gtk_decoration_layout; conversation_list_titlebar_csd.decoration_layout = gtk_settings.gtk_decoration_layout;
conversation_titlebar_csd.decoration_layout = ""; conversation_titlebar_csd.decoration_layout = "";
} else { } else {