Просмотр исходного кода

app: prefix select_layer with channel names to have clean schema

darkfi 20 часов назад
Родитель
Сommit
c5728a308f

+ 2 - 2
bin/app/src/app/schema/chat.rs

@@ -673,7 +673,7 @@ pub async fn make(
     // the netstatus layer, so its single background box draws over the netstatus
     // icons and its buttons win click hit-testing. It carries `unselect_btn`
     // (over `back_btn`) and `copy_btn` (over the reconnect button).
-    let select_layer = create_layer("select_layer");
+    let select_layer = create_layer(&(channel.to_string() + "_select_layer"));
     let prop = select_layer.get_property("rect").unwrap();
     prop.set_f32(atom, Role::App, 0, 0.).unwrap();
     prop.set_f32(atom, Role::App, 1, 0.).unwrap();
@@ -770,7 +770,7 @@ pub async fn make(
             let atom = &mut redraw2.make_guard(gfxtag!("select_changed"));
             select_is_visible.set(atom, selected);
             back_btn_bg_node2.set_property_bool(atom, Role::App, "is_visible", !selected).unwrap();
-            if let Some(netstatus_layer) = sg_root2.lookup_node("/window/content/netstatus_layer") {
+            if let Some(netstatus_layer) = sg_root2.lookup_node("/window/content/chat/netstatus_layer") {
                 netstatus_layer
                     .set_property_bool(atom, Role::App, "is_visible", !selected)
                     .unwrap();

+ 2 - 2
bin/app/src/app/schema/menu/channel.rs

@@ -612,7 +612,7 @@ pub async fn make(
             contact_vis.set(atom, false);
             channel_vis.set(atom, true);
 
-            let netstatus_layer = sg_root.lookup_node("/window/content/netstatus_layer").unwrap();
+            let netstatus_layer = sg_root.lookup_node("/window/content/chat/netstatus_layer").unwrap();
             netstatus_layer.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
 
             debug!("channels btn click - switching to channels");
@@ -707,7 +707,7 @@ pub async fn make(
             channel_vis.set(atom, false);
             contact_vis.set(atom, true);
 
-            let netstatus_layer = sg_root.lookup_node("/window/content/netstatus_layer").unwrap();
+            let netstatus_layer = sg_root.lookup_node("/window/content/chat/netstatus_layer").unwrap();
             netstatus_layer.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
 
             debug!("contacts btn click - switching to contacts");

+ 2 - 2
bin/app/src/app/schema/menu/contact.rs

@@ -612,7 +612,7 @@ pub async fn make(
             channel_vis.set(atom, false);
             contact_vis.set(atom, true);
 
-            let netstatus_layer = sg_root.lookup_node("/window/content/netstatus_layer").unwrap();
+            let netstatus_layer = sg_root.lookup_node("/window/content/chat/netstatus_layer").unwrap();
             netstatus_layer.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
 
             debug!("contacts btn click - switching to contacts");
@@ -703,7 +703,7 @@ pub async fn make(
             contact_vis.set(atom, false);
             channel_vis.set(atom, true);
 
-            let netstatus_layer = sg_root.lookup_node("/window/content/netstatus_layer").unwrap();
+            let netstatus_layer = sg_root.lookup_node("/window/content/chat/netstatus_layer").unwrap();
             netstatus_layer.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
 
             debug!("channels btn click - switching to channels");

+ 1 - 1
bin/app/src/app/schema/mod.rs

@@ -694,7 +694,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish, db
             /*
             // Show netstat-klik icon
             let netstat_klik =
-                sg_root.lookup_node("/window/content/netstatus_layer/netstat_klik").unwrap();
+                sg_root.lookup_node("/window/content/chat/netstatus_layer/netstat_klik").unwrap();
 
             {
                 let atom = &mut redraw.make_guard(gfxtag!("netstat_klik_show"));

+ 4 - 4
bin/app/src/main.rs

@@ -357,10 +357,10 @@ async fn load_plugins(
         let sg_root2 = sg_root.clone();
         let redraw2 = redraw.clone();
         let listen_connect = ex.spawn(async move {
-            let net0 = sg_root2.lookup_node("/window/content/netstatus_layer/net0").unwrap();
-            let net1 = sg_root2.lookup_node("/window/content/netstatus_layer/net1").unwrap();
-            let net2 = sg_root2.lookup_node("/window/content/netstatus_layer/net2").unwrap();
-            let net3 = sg_root2.lookup_node("/window/content/netstatus_layer/net3").unwrap();
+            let net0 = sg_root2.lookup_node("/window/content/chat/netstatus_layer/net0").unwrap();
+            let net1 = sg_root2.lookup_node("/window/content/chat/netstatus_layer/net1").unwrap();
+            let net2 = sg_root2.lookup_node("/window/content/chat/netstatus_layer/net2").unwrap();
+            let net3 = sg_root2.lookup_node("/window/content/chat/netstatus_layer/net3").unwrap();
 
             let net0_is_visible = PropertyBool::wrap(&net0, Role::App, "is_visible", 0).unwrap();
             let net1_is_visible = PropertyBool::wrap(&net1, Role::App, "is_visible", 0).unwrap();