Преглед на файлове

app: s/node.setup(|me| Button::new(me))/node.setup(Button::new)/

jkds преди 7 месеца
родител
ревизия
04e0a80222
променени са 5 файла, в които са добавени 15 реда и са изтрити 15 реда
  1. 8 8
      bin/app/src/app/schema/chat.rs
  2. 1 1
      bin/app/src/app/schema/menu.rs
  3. 1 1
      bin/app/src/app/schema/mod.rs
  4. 4 4
      bin/app/src/app/schema/settings.rs
  5. 1 1
      bin/app/src/app/schema/test.rs

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

@@ -340,7 +340,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Create shortcut to go back as well
@@ -948,7 +948,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Create shortcut to send as well
@@ -1052,7 +1052,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Commands help hint
@@ -1099,7 +1099,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     cmd_layer_node.link(node);
 
     // Create the actionbar bg
@@ -1365,7 +1365,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Paste button
@@ -1398,7 +1398,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Select all button
@@ -1419,7 +1419,7 @@ pub async fn make(
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Paste overlay popup
@@ -1524,7 +1524,7 @@ pub async fn make(
     prop.set_f32(atom, Role::App, 2, ACTION_PASTE_RECT.w).unwrap();
     prop.set_f32(atom, Role::App, 3, ACTION_PASTE_RECT.h).unwrap();
 
-    let node = node.setup(|me| Button::new(me)).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node.clone());
 
     let (slot, recvr) = Slot::new("paste_clicked");

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

@@ -271,7 +271,7 @@ pub async fn make(app: &App, content: SceneNodePtr, i18n_fish: &I18nBabelFish) {
         });
         app.tasks.lock().unwrap().push(listen_click);
 
-        let node = node.setup(|me| Button::new(me)).await;
+        let node = node.setup(Button::new).await;
         layer_node.link(node);
 
         // Create shortcut

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

@@ -583,7 +583,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+    let node = node.setup(Button::new).await;
     settingslayer_node.link(node);
     */
 

+ 4 - 4
bin/app/src/app/schema/settings.rs

@@ -259,7 +259,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
     });
     app.tasks.lock().unwrap().push(listen_click);
 
-    let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node.clone());
 
     // Label: "SETTINGS" title
@@ -1358,7 +1358,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
                 });
                 app.tasks.lock().unwrap().push(listen_click);
 
-                let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+                let node = node.setup(Button::new).await;
                 setting_layer_node.link(node.clone());
             }
         }
@@ -1404,7 +1404,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
             prop.set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
             node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
 
-            let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+            let node = node.setup(Button::new).await;
             setting_layer_node.link(node.clone());
 
             // Handle confirm button click
@@ -1457,7 +1457,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
         prop.set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
         node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
 
-        let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+        let node = node.setup(Button::new).await;
         setting_layer_node.link(node.clone());
 
         // Handle reset button click

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

@@ -163,7 +163,7 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
     //let slot_click = Slot { name: "button_clicked".to_string(), notify: sender };
     //node.register("click", slot_click).unwrap();
 
-    let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
+    let node = node.setup(Button::new).await;
     layer_node.link(node);
 
     // Create another mesh