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

app/edit: on android dont use set_select() just push the entire state for now which is more robust.

darkfi 1 неделя назад
Родитель
Сommit
0203bba467
4 измененных файлов с 7 добавлено и 18 удалено
  1. 1 1
      bin/app/Makefile
  2. 0 13
      bin/app/src/app/schema/chat.rs
  3. 6 3
      bin/app/src/text/editor/android.rs
  4. 0 1
      bin/app/src/ui/edit/mod.rs

+ 1 - 1
bin/app/Makefile

@@ -29,7 +29,7 @@ DEBUG_FEATURES = --features=enable-filelog,enable-plugins
 
 
 #DEV_FEATURES = --features=enable-filelog,enable-netdebug,emulate-android
 #DEV_FEATURES = --features=enable-filelog,enable-netdebug,emulate-android
 #DEV_FEATURES = --features=enable-filelog,enable-netdebug,enable-plugins
 #DEV_FEATURES = --features=enable-filelog,enable-netdebug,enable-plugins
-DEV_FEATURES = --features=schema-app,enable-netdebug,enable-plugin-drk
+DEV_FEATURES = --features=schema-app,enable-netdebug,enable-plugin-darkirc
 
 
 default: build-release
 default: build-release
 	./darkfi-app
 	./darkfi-app

+ 0 - 13
bin/app/src/app/schema/chat.rs

@@ -589,19 +589,6 @@ pub async fn make(
     });
     });
     layer_node.push_task(listen_file_download);
     layer_node.push_task(listen_file_download);
 
 
-    if is_first_time {
-        let chatview = match chatview_node.pimpl() {
-            Pimpl::ChatView(obj) => obj.as_ref(),
-            _ => panic!("wrong pimpl for chatview"),
-        };
-        chatview.handle_insert_line(
-            unixtime(),
-            chatview::MessageId(rand::random()),
-            "NOTICE".to_string(),
-            "This is your first time connecting. Please be patient while the network syncs. We will fix this in future releases".to_string()
-        ).await;
-    }
-
     // Create the editbox bg
     // Create the editbox bg
     let node = create_vector_art("editbox_bg");
     let node = create_vector_art("editbox_bg");
     let prop = node.get_property("rect").unwrap();
     let prop = node.get_property("rect").unwrap();

+ 6 - 3
bin/app/src/text/editor/android.rs

@@ -133,7 +133,8 @@ impl Editor {
         assert!(cursor_idx <= self.state.text.len());
         assert!(cursor_idx <= self.state.text.len());
         assert_eq!(self.state.text, self.text.get());
         assert_eq!(self.state.text, self.text.get());
         self.state.select = (cursor_idx, cursor_idx);
         self.state.select = (cursor_idx, cursor_idx);
-        self.input.set_select(cursor_idx, cursor_idx);
+        self.state.compose = None;
+        self.input.set_state(self.state.clone());
     }
     }
 
 
     pub fn select_word_at_point(&mut self, pos: Point) {
     pub fn select_word_at_point(&mut self, pos: Point) {
@@ -216,13 +217,15 @@ impl Editor {
         assert!(select_end <= self.state.text.len());
         assert!(select_end <= self.state.text.len());
         assert_eq!(self.state.text, self.text.get());
         assert_eq!(self.state.text, self.text.get());
         self.state.select = (select_start, select_end);
         self.state.select = (select_start, select_end);
-        self.input.set_select(select_start, select_end);
+        self.state.compose = None;
+        self.input.set_state(self.state.clone());
     }
     }
 
 
     pub fn select_all(&mut self) {
     pub fn select_all(&mut self) {
         let text_len = self.state.text.len();
         let text_len = self.state.text.len();
         self.state.select = (0, text_len);
         self.state.select = (0, text_len);
-        self.input.set_select(0, text_len);
+        self.state.compose = None;
+        self.input.set_state(self.state.clone());
     }
     }
 
 
     #[allow(dead_code)]
     #[allow(dead_code)]

+ 0 - 1
bin/app/src/ui/edit/mod.rs

@@ -1476,7 +1476,6 @@ impl BaseEdit {
             ed!("focus method: setting android input_type={input_type}");
             ed!("focus method: setting android input_type={input_type}");
             self_.editor.lock().set_input_type(input_type);
             self_.editor.lock().set_input_type(input_type);
         }
         }
-
         self_.editor.lock().focus();
         self_.editor.lock().focus();
 
 
         let atom = &mut self_.renderer.make_guard(gfxtag!("BaseEdit::process_focus_method"));
         let atom = &mut self_.renderer.make_guard(gfxtag!("BaseEdit::process_focus_method"));