|
@@ -16,23 +16,20 @@
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
-use darkfi::net::settings;
|
|
|
|
|
-use sled_overlay::sled;
|
|
|
|
|
-
|
|
|
|
|
use crate::{
|
|
use crate::{
|
|
|
app::{
|
|
app::{
|
|
|
node::{create_button, create_editbox, create_layer, create_text, create_vector_art},
|
|
node::{create_button, create_editbox, create_layer, create_text, create_vector_art},
|
|
|
App,
|
|
App,
|
|
|
},
|
|
},
|
|
|
expr::{self, Compiler},
|
|
expr::{self, Compiler},
|
|
|
- prop::{Property, PropertyAtomicGuard, PropertyFloat32, PropertyStr, PropertyValue, Role},
|
|
|
|
|
|
|
+ prop::{PropertyAtomicGuard, PropertyFloat32, PropertyStr, PropertyValue, Role},
|
|
|
scene::{SceneNodePtr, Slot},
|
|
scene::{SceneNodePtr, Slot},
|
|
|
shape,
|
|
shape,
|
|
|
- ui::{Button, EditBox, Layer, OnModify, ShapeVertex, Text, VectorArt, VectorShape},
|
|
|
|
|
|
|
+ ui::{Button, EditBox, Layer, ShapeVertex, Text, VectorArt, VectorShape},
|
|
|
ExecutorPtr,
|
|
ExecutorPtr,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-use super::{ColorScheme, CHANNELS, COLOR_SCHEME};
|
|
|
|
|
|
|
+use super::{ColorScheme, COLOR_SCHEME};
|
|
|
|
|
|
|
|
use std::{
|
|
use std::{
|
|
|
collections::BTreeMap,
|
|
collections::BTreeMap,
|
|
@@ -43,7 +40,6 @@ mod android_ui_consts {
|
|
|
pub const SETTING_LABEL_X: f32 = 40.;
|
|
pub const SETTING_LABEL_X: f32 = 40.;
|
|
|
pub const SETTING_LABEL_LINESPACE: f32 = 140.;
|
|
pub const SETTING_LABEL_LINESPACE: f32 = 140.;
|
|
|
pub const SETTING_LABEL_BASELINE: f32 = 82.;
|
|
pub const SETTING_LABEL_BASELINE: f32 = 82.;
|
|
|
- pub const SUBTITLE_LABEL_FONTSIZE: f32 = 36.;
|
|
|
|
|
pub const SETTING_LABEL_FONTSIZE: f32 = 24.;
|
|
pub const SETTING_LABEL_FONTSIZE: f32 = 24.;
|
|
|
pub const SETTING_EDIT_FONTSIZE: f32 = 24.;
|
|
pub const SETTING_EDIT_FONTSIZE: f32 = 24.;
|
|
|
pub const SETTING_TITLE_X: f32 = 150.;
|
|
pub const SETTING_TITLE_X: f32 = 150.;
|
|
@@ -80,7 +76,6 @@ mod ui_consts {
|
|
|
pub const SETTING_LABEL_X: f32 = 20.;
|
|
pub const SETTING_LABEL_X: f32 = 20.;
|
|
|
pub const SETTING_LABEL_LINESPACE: f32 = 60.;
|
|
pub const SETTING_LABEL_LINESPACE: f32 = 60.;
|
|
|
pub const SETTING_LABEL_BASELINE: f32 = 37.;
|
|
pub const SETTING_LABEL_BASELINE: f32 = 37.;
|
|
|
- pub const SUBTITLE_LABEL_FONTSIZE: f32 = 16.;
|
|
|
|
|
pub const SETTING_LABEL_FONTSIZE: f32 = 14.;
|
|
pub const SETTING_LABEL_FONTSIZE: f32 = 14.;
|
|
|
pub const SETTING_EDIT_FONTSIZE: f32 = 14.;
|
|
pub const SETTING_EDIT_FONTSIZE: f32 = 14.;
|
|
|
pub const SETTING_TITLE_X: f32 = 100.;
|
|
pub const SETTING_TITLE_X: f32 = 100.;
|
|
@@ -126,9 +121,19 @@ impl Setting {
|
|
|
fn get_value(&self) -> PropertyValue {
|
|
fn get_value(&self) -> PropertyValue {
|
|
|
self.node.get_property("value").unwrap().get_value(0).ok().unwrap()
|
|
self.node.get_property("value").unwrap().get_value(0).ok().unwrap()
|
|
|
}
|
|
}
|
|
|
|
|
+ fn get_default(&self) -> PropertyValue {
|
|
|
|
|
+ self.node.get_property("default").unwrap().get_value(0).ok().unwrap()
|
|
|
|
|
+ }
|
|
|
|
|
+ fn is_default(&self) -> bool {
|
|
|
|
|
+ self.get_value() == self.get_default()
|
|
|
|
|
+ }
|
|
|
|
|
+ fn reset(&self) {
|
|
|
|
|
+ let prop = self.node.get_property("value").unwrap();
|
|
|
|
|
+ prop.set_raw_value(Role::App, 0, self.get_default()).unwrap();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
|
|
|
|
+pub async fn make(app: &App, window: SceneNodePtr, _ex: ExecutorPtr) {
|
|
|
let mut cc = Compiler::new();
|
|
let mut cc = Compiler::new();
|
|
|
cc.add_const_f32("BORDER_RIGHT_SCALE", BORDER_RIGHT_SCALE);
|
|
cc.add_const_f32("BORDER_RIGHT_SCALE", BORDER_RIGHT_SCALE);
|
|
|
cc.add_const_f32("SEARCH_PADDING_X", SEARCH_PADDING_X);
|
|
cc.add_const_f32("SEARCH_PADDING_X", SEARCH_PADDING_X);
|
|
@@ -266,19 +271,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
node.set_property_f32(atom, Role::App, "baseline", SETTING_TITLE_BASELINE).unwrap();
|
|
node.set_property_f32(atom, Role::App, "baseline", SETTING_TITLE_BASELINE).unwrap();
|
|
|
node.set_property_f32(atom, Role::App, "font_size", SETTING_TITLE_FONTSIZE).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", SETTING_TITLE_FONTSIZE).unwrap();
|
|
|
node.set_property_str(atom, Role::App, "text", "SETTINGS").unwrap();
|
|
node.set_property_str(atom, Role::App, "text", "SETTINGS").unwrap();
|
|
|
- //node.set_property_str(atom, Role::App, "text", "anon1").unwrap();
|
|
|
|
|
- let prop = node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ node.set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 1.]).unwrap();
|
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
|
|
|
|
|
|
let node = node
|
|
let node = node
|
|
@@ -331,18 +324,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
.set_expr(atom, Role::App, 2, cc.compile("w - SEARCH_PADDING_X*2").unwrap())
|
|
.set_expr(atom, Role::App, 2, cc.compile("w - SEARCH_PADDING_X*2").unwrap())
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
|
- let prop = editbox_node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ editbox_node.set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 1.]).unwrap();
|
|
|
let prop = editbox_node.get_property("cursor_color").unwrap();
|
|
let prop = editbox_node.get_property("cursor_color").unwrap();
|
|
|
prop.clone().set_f32(atom, Role::App, 0, 0.5).unwrap();
|
|
prop.clone().set_f32(atom, Role::App, 0, 0.5).unwrap();
|
|
|
prop.clone().set_f32(atom, Role::App, 1, 0.5).unwrap();
|
|
prop.clone().set_f32(atom, Role::App, 1, 0.5).unwrap();
|
|
@@ -352,18 +334,9 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_descent", CURSOR_DESCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_descent", CURSOR_DESCENT).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "select_ascent", SELECT_ASCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "select_ascent", SELECT_ASCENT).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "select_descent", SELECT_DESCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "select_descent", SELECT_DESCENT).unwrap();
|
|
|
- let prop = editbox_node.get_property("hi_bg_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 0.5).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ editbox_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "hi_bg_color", vec![0.5, 0.5, 0.5, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
let prop = editbox_node.get_property("selected").unwrap();
|
|
let prop = editbox_node.get_property("selected").unwrap();
|
|
|
prop.clone().set_null(atom, Role::App, 0).unwrap();
|
|
prop.clone().set_null(atom, Role::App, 0).unwrap();
|
|
|
prop.clone().set_null(atom, Role::App, 1).unwrap();
|
|
prop.clone().set_null(atom, Role::App, 1).unwrap();
|
|
@@ -400,18 +373,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
node.set_property_f32(atom, Role::App, "baseline", 16.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "baseline", 16.).unwrap();
|
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
|
node.set_property_str(atom, Role::App, "text", "SEARCH...").unwrap();
|
|
node.set_property_str(atom, Role::App, "text", "SEARCH...").unwrap();
|
|
|
- let prop = node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 0.45).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ node.set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 0.45]).unwrap();
|
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
|
|
|
|
|
|
let node = node
|
|
let node = node
|
|
@@ -438,18 +400,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
node.set_property_f32(atom, Role::App, "baseline", 16.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "baseline", 16.).unwrap();
|
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
|
node.set_property_str(atom, Role::App, "text", "").unwrap();
|
|
node.set_property_str(atom, Role::App, "text", "").unwrap();
|
|
|
- let prop = node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.94).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ node.set_property_f32_vec(atom, Role::App, "text_color", vec![0., 0.94, 1., 1.]).unwrap();
|
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
|
|
|
|
|
|
let node = node
|
|
let node = node
|
|
@@ -466,7 +417,6 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
layer_node.clone().link(node);
|
|
layer_node.clone().link(node);
|
|
|
|
|
|
|
|
let sg_root3 = app.sg_root.clone();
|
|
let sg_root3 = app.sg_root.clone();
|
|
|
- let mut cc2 = cc.clone();
|
|
|
|
|
let search = move || {
|
|
let search = move || {
|
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
|
|
|
|
|
@@ -519,7 +469,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
// Handle searching
|
|
// Handle searching
|
|
|
let search_text = editbox_node.get_property("text").unwrap();
|
|
let search_text = editbox_node.get_property("text").unwrap();
|
|
|
let search_text_sub = search_text.subscribe_modify();
|
|
let search_text_sub = search_text.subscribe_modify();
|
|
|
- let mut search2 = search.clone();
|
|
|
|
|
|
|
+ let search2 = search.clone();
|
|
|
let listen_search_text = app.ex.spawn(async move {
|
|
let listen_search_text = app.ex.spawn(async move {
|
|
|
while let Ok(_) = search_text_sub.receive().await {
|
|
while let Ok(_) = search_text_sub.receive().await {
|
|
|
search2();
|
|
search2();
|
|
@@ -670,7 +620,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
layer_node.clone().link(settings_layer_node.clone());
|
|
layer_node.clone().link(settings_layer_node.clone());
|
|
|
|
|
|
|
|
// Iterate over the map and process each setting
|
|
// Iterate over the map and process each setting
|
|
|
- for (key, setting) in settings_map {
|
|
|
|
|
|
|
+ for setting in settings_map.values() {
|
|
|
let setting_clone = setting.clone();
|
|
let setting_clone = setting.clone();
|
|
|
let setting_name = setting_clone.name.clone();
|
|
let setting_name = setting_clone.name.clone();
|
|
|
let is_bool = matches!(setting_clone.get_value(), PropertyValue::Bool(_));
|
|
let is_bool = matches!(setting_clone.get_value(), PropertyValue::Bool(_));
|
|
@@ -946,17 +896,14 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
.set_property_f32(atom, Role::App, "font_size", SETTING_LABEL_FONTSIZE)
|
|
.set_property_f32(atom, Role::App, "font_size", SETTING_LABEL_FONTSIZE)
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
label_value_node.set_property_str(atom, Role::App, "text", setting_name.clone()).unwrap();
|
|
label_value_node.set_property_str(atom, Role::App, "text", setting_name.clone()).unwrap();
|
|
|
- let prop = label_value_node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.65).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.87).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.83).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
|
|
+ if setting.is_default() {
|
|
|
|
|
+ label_value_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "text_color", vec![0.65, 0.87, 0.83, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ label_value_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
label_value_node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
label_value_node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
|
|
|
|
|
@@ -988,39 +935,19 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "baseline", SETTING_LABEL_BASELINE).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "baseline", SETTING_LABEL_BASELINE).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "font_size", SETTING_EDIT_FONTSIZE).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "font_size", SETTING_EDIT_FONTSIZE).unwrap();
|
|
|
- let prop = editbox_node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.7).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.7).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.7).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
- let prop = editbox_node.get_property("cursor_color").unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_ascent", CURSOR_ASCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_ascent", CURSOR_ASCENT).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_descent", CURSOR_DESCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "cursor_descent", CURSOR_DESCENT).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "select_ascent", SELECT_ASCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "select_ascent", SELECT_ASCENT).unwrap();
|
|
|
editbox_node.set_property_f32(atom, Role::App, "select_descent", SELECT_DESCENT).unwrap();
|
|
editbox_node.set_property_f32(atom, Role::App, "select_descent", SELECT_DESCENT).unwrap();
|
|
|
- let prop = editbox_node.get_property("hi_bg_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.5).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 0.5).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ editbox_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "text_color", vec![0.7, 0.7, 0.7, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ editbox_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "cursor_color", vec![0.5, 0.5, 0.5, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ editbox_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "hi_bg_color", vec![0.5, 0.5, 0.5, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
let prop = editbox_node.get_property("selected").unwrap();
|
|
let prop = editbox_node.get_property("selected").unwrap();
|
|
|
prop.clone().set_null(atom, Role::App, 0).unwrap();
|
|
prop.clone().set_null(atom, Role::App, 0).unwrap();
|
|
|
prop.clone().set_null(atom, Role::App, 1).unwrap();
|
|
prop.clone().set_null(atom, Role::App, 1).unwrap();
|
|
@@ -1036,7 +963,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
let (slot, recvr) = Slot::new("setting_enter_pressed");
|
|
let (slot, recvr) = Slot::new("setting_enter_pressed");
|
|
|
editbox_node.register("enter_pressed", slot).unwrap();
|
|
editbox_node.register("enter_pressed", slot).unwrap();
|
|
|
let setting2 = setting.clone();
|
|
let setting2 = setting.clone();
|
|
|
- let sg_root2 = app.sg_root.clone();
|
|
|
|
|
|
|
+ let sg_root2 = setting_layer_node.clone();
|
|
|
let active_setting2 = active_setting.clone();
|
|
let active_setting2 = active_setting.clone();
|
|
|
let editz_text2 = editz_text.clone();
|
|
let editz_text2 = editz_text.clone();
|
|
|
let listen_enter = app.ex.spawn(async move {
|
|
let listen_enter = app.ex.spawn(async move {
|
|
@@ -1048,6 +975,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
editz_text2.clone(),
|
|
editz_text2.clone(),
|
|
|
)
|
|
)
|
|
|
.await;
|
|
.await;
|
|
|
|
|
+ refresh_setting(setting2.clone(), sg_root2.clone());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
app.tasks.lock().unwrap().push(listen_enter);
|
|
app.tasks.lock().unwrap().push(listen_enter);
|
|
@@ -1159,17 +1087,24 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
value_node
|
|
value_node
|
|
|
.set_property_str(atom, Role::App, "text", setting_clone.value_as_string())
|
|
.set_property_str(atom, Role::App, "text", setting_clone.value_as_string())
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
- let prop = value_node.get_property("text_color").unwrap();
|
|
|
|
|
if matches!(setting_clone.get_value(), PropertyValue::Bool(false)) {
|
|
if matches!(setting_clone.get_value(), PropertyValue::Bool(false)) {
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.9).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.4).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.4).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
|
|
+ value_node
|
|
|
|
|
+ .set_property_f32_vec(
|
|
|
|
|
+ atom,
|
|
|
|
|
+ Role::App,
|
|
|
|
|
+ "text_color",
|
|
|
|
|
+ vec![0.9, 0.4, 0.4, 1.],
|
|
|
|
|
+ )
|
|
|
|
|
+ .unwrap();
|
|
|
} else {
|
|
} else {
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.94).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
|
|
+ value_node
|
|
|
|
|
+ .set_property_f32_vec(
|
|
|
|
|
+ atom,
|
|
|
|
|
+ Role::App,
|
|
|
|
|
+ "text_color",
|
|
|
|
|
+ vec![0.0, 0.94, 1., 1.],
|
|
|
|
|
+ )
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
value_node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
|
|
value_node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
|
|
|
|
|
|
|
@@ -1212,18 +1147,9 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
value_node
|
|
value_node
|
|
|
.set_property_str(atom, Role::App, "text", setting_clone.value_as_string())
|
|
.set_property_str(atom, Role::App, "text", setting_clone.value_as_string())
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
- let prop = value_node.get_property("text_color").unwrap();
|
|
|
|
|
- if COLOR_SCHEME == ColorScheme::DarkMode {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else if COLOR_SCHEME == ColorScheme::PaperLight {
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ value_node
|
|
|
|
|
+ .set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
value_node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
|
|
value_node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
|
|
|
|
|
|
|
|
let node = value_node
|
|
let node = value_node
|
|
@@ -1251,10 +1177,12 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
prop.clone().set_f32(atom, Role::App, 3, SETTING_LABEL_LINESPACE).unwrap();
|
|
|
|
|
|
|
|
- let sg_root = app.sg_root.clone();
|
|
|
|
|
|
|
+ let sg_root2 = app.sg_root.clone();
|
|
|
|
|
+ let setting_clone2 = setting_clone.clone();
|
|
|
|
|
+ let setting_root2 = setting_layer_node.clone();
|
|
|
let select = move || {
|
|
let select = move || {
|
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
|
- let sg_root = sg_root.clone();
|
|
|
|
|
|
|
+ let sg_root = sg_root2.clone();
|
|
|
let mut lock = cloned_active_setting.lock().unwrap();
|
|
let mut lock = cloned_active_setting.lock().unwrap();
|
|
|
|
|
|
|
|
let path = "/window/settings_layer/search_input";
|
|
let path = "/window/settings_layer/search_input";
|
|
@@ -1263,37 +1191,39 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
|
|
|
|
|
|
let was_active = if let Some(s) = lock.as_ref() {
|
|
let was_active = if let Some(s) = lock.as_ref() {
|
|
|
- let _was_active = s.name == setting_clone.clone().name;
|
|
|
|
|
|
|
+ let path = format!("/window/settings_layer/settings/{}", &s.name);
|
|
|
|
|
+ let old_node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
+
|
|
|
|
|
+ let _was_active = s.name == setting_clone2.clone().name;
|
|
|
|
|
|
|
|
- // Hide the selected setting value label (set its text empty)
|
|
|
|
|
|
|
+ // Show the selected setting value label
|
|
|
// of the selected setting, if there's one
|
|
// of the selected setting, if there's one
|
|
|
- let path = format!("/window/settings_layer/settings/{}/value_label", &s.name);
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
|
|
+ let node = old_node.clone().lookup_node("/value_label").unwrap();
|
|
|
let text = PropertyStr::wrap(&node, Role::App, "text", 0).unwrap();
|
|
let text = PropertyStr::wrap(&node, Role::App, "text", 0).unwrap();
|
|
|
text.set(atom, &s.value_as_string());
|
|
text.set(atom, &s.value_as_string());
|
|
|
|
|
|
|
|
- // Hide the selected setting value label (set its text empty)
|
|
|
|
|
|
|
+ // Hide the selected setting editbox
|
|
|
// of the selected setting, if there's one
|
|
// of the selected setting, if there's one
|
|
|
if !_was_active {
|
|
if !_was_active {
|
|
|
- let path =
|
|
|
|
|
- format!("/window/settings_layer/settings/{}/value_editbox", &s.name);
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
|
|
+ let node = old_node.clone().lookup_node("/value_editbox").unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_active", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_active", false).unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
|
node.set_property_f32(atom, Role::App, "font_size", 0.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", 0.).unwrap();
|
|
|
node.set_property_str(atom, Role::App, "text", "").unwrap();
|
|
node.set_property_str(atom, Role::App, "text", "").unwrap();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Hide confirm button
|
|
|
|
|
|
|
+ // Hide conftrm button
|
|
|
// (Bool settings don't have a confirm button so we have to check for it to
|
|
// (Bool settings don't have a confirm button so we have to check for it to
|
|
|
// not panic)
|
|
// not panic)
|
|
|
let is_bool =
|
|
let is_bool =
|
|
|
matches!(lock.clone().unwrap().get_value(), PropertyValue::Bool(_));
|
|
matches!(lock.clone().unwrap().get_value(), PropertyValue::Bool(_));
|
|
|
if !is_bool {
|
|
if !is_bool {
|
|
|
- let path =
|
|
|
|
|
- format!("/window/settings_layer/settings/{}/confirm_btn_bg", &s.name);
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
|
|
|
|
|
+ old_node
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/confirm_btn_bg")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", false)
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
_was_active
|
|
_was_active
|
|
@@ -1302,132 +1232,107 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// Update what setting active_setting points to
|
|
// Update what setting active_setting points to
|
|
|
- *lock = Some(setting_clone.clone());
|
|
|
|
|
|
|
+ *lock = Some(setting_clone2.clone());
|
|
|
debug!("active setting set to: {}", lock.clone().unwrap().name);
|
|
debug!("active setting set to: {}", lock.clone().unwrap().name);
|
|
|
|
|
|
|
|
- let is_bool = matches!(lock.clone().unwrap().get_value(), PropertyValue::Bool(_));
|
|
|
|
|
if is_bool {
|
|
if is_bool {
|
|
|
// Hide the setting value label (set its text empty)
|
|
// Hide the setting value label (set its text empty)
|
|
|
- let label_path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_label",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let editbox = sg_root.clone().lookup_node(&label_path).unwrap();
|
|
|
|
|
|
|
+ let editbox = setting_root2.clone().lookup_node("/value_label").unwrap();
|
|
|
let label_text = PropertyStr::wrap(&editbox, Role::App, "text", 0).unwrap();
|
|
let label_text = PropertyStr::wrap(&editbox, Role::App, "text", 0).unwrap();
|
|
|
- let value = &lock.clone().unwrap().get_value();
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_bg_bool_true",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", false);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_bg_bool_false",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", false);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/bool_icon_bg_true",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", false);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/bool_icon_bg_false",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", false);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ let value = setting_clone2.get_value();
|
|
|
|
|
+
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/value_bg_bool_true")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", false)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/value_bg_bool_false")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", false)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/bool_icon_bg_true")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", false)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/bool_icon_bg_false")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", false)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
|
|
|
if matches!(value, PropertyValue::Bool(false)) {
|
|
if matches!(value, PropertyValue::Bool(false)) {
|
|
|
- &lock.clone().unwrap().node.set_property_bool(
|
|
|
|
|
- atom,
|
|
|
|
|
- Role::User,
|
|
|
|
|
- "value",
|
|
|
|
|
- true,
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ setting_clone2
|
|
|
|
|
+ .node
|
|
|
|
|
+ .set_property_bool(atom, Role::User, "value", true)
|
|
|
|
|
+ .unwrap();
|
|
|
label_text.set(atom, "TRUE");
|
|
label_text.set(atom, "TRUE");
|
|
|
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_bg_bool_true",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", true);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/bool_icon_bg_true",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", true);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_label",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let prop = node.get_property("text_color").unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.94).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 1.).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
- } else {
|
|
|
|
|
- &lock.clone().unwrap().node.set_property_bool(
|
|
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/value_bg_bool_true")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", true)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/bool_icon_bg_true")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", true)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+
|
|
|
|
|
+ let node = setting_root2.clone().lookup_node("/value_label").unwrap();
|
|
|
|
|
+ node.set_property_f32_vec(
|
|
|
atom,
|
|
atom,
|
|
|
- Role::User,
|
|
|
|
|
- "value",
|
|
|
|
|
- false,
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ Role::App,
|
|
|
|
|
+ "text_color",
|
|
|
|
|
+ vec![0., 0.94, 1., 1.],
|
|
|
|
|
+ )
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ setting_clone2
|
|
|
|
|
+ .node
|
|
|
|
|
+ .set_property_bool(atom, Role::User, "value", false)
|
|
|
|
|
+ .unwrap();
|
|
|
label_text.set(atom, "FALSE");
|
|
label_text.set(atom, "FALSE");
|
|
|
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_bg_bool_false",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", true);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/bool_icon_bg_false",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", true);
|
|
|
|
|
-
|
|
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_label",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let prop = node.get_property("text_color").unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 0, 0.9).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 1, 0.4).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 2, 0.4).unwrap();
|
|
|
|
|
- prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
|
|
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/value_bg_bool_false")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", true)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/bool_icon_bg_false")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", true)
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+
|
|
|
|
|
+ let node = setting_root2.clone().lookup_node("/value_label").unwrap();
|
|
|
|
|
+ node.set_property_f32_vec(
|
|
|
|
|
+ atom,
|
|
|
|
|
+ Role::App,
|
|
|
|
|
+ "text_color",
|
|
|
|
|
+ vec![0.9, 0.4, 0.4, 1.],
|
|
|
|
|
+ )
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
// Hide the setting value label (set its text empty)
|
|
// Hide the setting value label (set its text empty)
|
|
|
// TODO?: Visilibity property on labels
|
|
// TODO?: Visilibity property on labels
|
|
|
- let label_path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_label",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let editbox = sg_root.clone().lookup_node(&label_path).unwrap();
|
|
|
|
|
|
|
+ let editbox = setting_root2.clone().lookup_node("/value_label").unwrap();
|
|
|
let label_text = PropertyStr::wrap(&editbox, Role::App, "text", 0).unwrap();
|
|
let label_text = PropertyStr::wrap(&editbox, Role::App, "text", 0).unwrap();
|
|
|
label_text.set(atom, "");
|
|
label_text.set(atom, "");
|
|
|
|
|
|
|
|
// Show the editbox
|
|
// Show the editbox
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/value_editbox",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
|
|
+ let node = setting_root2.clone().lookup_node("/value_editbox").unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_active", true).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_active", true).unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_focused", true).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_focused", true).unwrap();
|
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", 16.).unwrap();
|
|
@@ -1436,33 +1341,37 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
atom,
|
|
atom,
|
|
|
Role::App,
|
|
Role::App,
|
|
|
"text",
|
|
"text",
|
|
|
- setting_clone.value_as_string(),
|
|
|
|
|
|
|
+ setting_clone2.value_as_string(),
|
|
|
)
|
|
)
|
|
|
.unwrap();
|
|
.unwrap();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Show confirm button
|
|
// Show confirm button
|
|
|
- let path = format!(
|
|
|
|
|
- "/window/settings_layer/settings/{}/confirm_btn_bg",
|
|
|
|
|
- &setting_clone.name
|
|
|
|
|
- );
|
|
|
|
|
- let node = sg_root.clone().lookup_node(&path).unwrap();
|
|
|
|
|
- let _ = node.set_property_bool(atom, Role::App, "is_visible", true);
|
|
|
|
|
|
|
+ setting_root2
|
|
|
|
|
+ .clone()
|
|
|
|
|
+ .lookup_node("/confirm_btn_bg")
|
|
|
|
|
+ .unwrap()
|
|
|
|
|
+ .set_property_bool(atom, Role::App, "is_visible", true)
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ refresh_setting(setting_clone2.clone(), setting_root2.clone());
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- let (slot, recvr) = Slot::new("back_clicked");
|
|
|
|
|
- node.register("click", slot).unwrap();
|
|
|
|
|
- let select2 = select.clone();
|
|
|
|
|
- let listen_click = app.ex.spawn(async move {
|
|
|
|
|
- while let Ok(_) = recvr.recv().await {
|
|
|
|
|
- select2();
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
- app.tasks.lock().unwrap().push(listen_click);
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ let (slot, recvr) = Slot::new("select_clicked");
|
|
|
|
|
+ node.register("click", slot).unwrap();
|
|
|
|
|
+ let select2 = select.clone();
|
|
|
|
|
+ let listen_click = app.ex.spawn(async move {
|
|
|
|
|
+ while let Ok(_) = recvr.recv().await {
|
|
|
|
|
+ select2();
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ app.tasks.lock().unwrap().push(listen_click);
|
|
|
|
|
|
|
|
- let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
|
|
|
|
|
- setting_layer_node.clone().link(node.clone());
|
|
|
|
|
|
|
+ let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
|
|
|
|
|
+ setting_layer_node.clone().link(node.clone());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if is_bool {
|
|
if is_bool {
|
|
@@ -1514,7 +1423,7 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
let (slot, recvr) = Slot::new("confirm_clicked");
|
|
let (slot, recvr) = Slot::new("confirm_clicked");
|
|
|
node.register("click", slot).unwrap();
|
|
node.register("click", slot).unwrap();
|
|
|
let setting2 = setting.clone();
|
|
let setting2 = setting.clone();
|
|
|
- let sg_root2 = app.sg_root.clone();
|
|
|
|
|
|
|
+ let sg_root2 = setting_layer_node.clone();
|
|
|
let active_setting2 = active_setting.clone();
|
|
let active_setting2 = active_setting.clone();
|
|
|
let editz_text2 = editz_text.clone();
|
|
let editz_text2 = editz_text.clone();
|
|
|
let listen_click = app.ex.spawn(async move {
|
|
let listen_click = app.ex.spawn(async move {
|
|
@@ -1527,35 +1436,118 @@ pub async fn make(app: &App, window: SceneNodePtr, ex: ExecutorPtr) {
|
|
|
editz_text2.clone(),
|
|
editz_text2.clone(),
|
|
|
)
|
|
)
|
|
|
.await;
|
|
.await;
|
|
|
|
|
+ refresh_setting(setting2.clone(), sg_root2.clone());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
app.tasks.lock().unwrap().push(listen_click);
|
|
app.tasks.lock().unwrap().push(listen_click);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // Reset icon
|
|
|
|
|
+ let node = create_vector_art("reset_btn_bg");
|
|
|
|
|
+ let prop = node.get_property("rect").unwrap();
|
|
|
|
|
+ prop.clone().set_expr(atom, Role::App, 0, cc.compile("w - 100").unwrap()).unwrap();
|
|
|
|
|
+ prop.clone().set_f32(atom, Role::App, 1, SETTING_LABEL_LINESPACE / 2.).unwrap();
|
|
|
|
|
+ prop.clone().set_f32(atom, Role::App, 2, 0.).unwrap();
|
|
|
|
|
+ prop.clone().set_f32(atom, Role::App, 3, 0.).unwrap();
|
|
|
|
|
+ node.set_property_bool(atom, Role::App, "is_visible", !setting.is_default()).unwrap();
|
|
|
|
|
+ node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
|
|
|
|
|
+
|
|
|
|
|
+ let shape = shape::create_reset([0., 0.94, 1., 1.]).scaled(15.);
|
|
|
|
|
+ let node = node
|
|
|
|
|
+ .setup(|me| VectorArt::new(me, shape, app.render_api.clone(), app.ex.clone()))
|
|
|
|
|
+ .await;
|
|
|
|
|
+ setting_layer_node.clone().link(node);
|
|
|
|
|
+
|
|
|
|
|
+ let node = create_button("reset_btn");
|
|
|
|
|
+ node.set_property_bool(atom, Role::App, "is_active", !setting.is_default()).unwrap();
|
|
|
|
|
+ let prop = node.get_property("rect").unwrap();
|
|
|
|
|
+ prop.clone().set_expr(atom, Role::App, 0, cc.compile("w - 115").unwrap()).unwrap();
|
|
|
|
|
+ prop.clone().set_f32(atom, Role::App, 1, 0.).unwrap();
|
|
|
|
|
+ prop.clone().set_f32(atom, Role::App, 2, 50.).unwrap();
|
|
|
|
|
+ prop.clone().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;
|
|
|
|
|
+ setting_layer_node.clone().link(node.clone());
|
|
|
|
|
+
|
|
|
|
|
+ // Handle reset button click
|
|
|
|
|
+ {
|
|
|
|
|
+ let (slot, recvr) = Slot::new("reset_clicked");
|
|
|
|
|
+ node.register("click", slot).unwrap();
|
|
|
|
|
+ let setting2 = setting.clone();
|
|
|
|
|
+ let sg_root2 = setting_layer_node.clone();
|
|
|
|
|
+ let active_setting2 = active_setting.clone();
|
|
|
|
|
+ let editz_text2 = editz_text.clone();
|
|
|
|
|
+ let listen_click = app.ex.spawn(async move {
|
|
|
|
|
+ while let Ok(_) = recvr.recv().await {
|
|
|
|
|
+ info!("reset clicked");
|
|
|
|
|
+ setting2.reset();
|
|
|
|
|
+
|
|
|
|
|
+ let atom = &mut PropertyAtomicGuard::new();
|
|
|
|
|
+
|
|
|
|
|
+ // Show the selected setting value label (set its text empty)
|
|
|
|
|
+ // of the selected setting, if there's one
|
|
|
|
|
+ let node = sg_root2.clone().lookup_node("/value_label").unwrap();
|
|
|
|
|
+ let text = PropertyStr::wrap(&node, Role::App, "text", 0).unwrap();
|
|
|
|
|
+ text.set(atom, setting2.value_as_string());
|
|
|
|
|
+
|
|
|
|
|
+ let node = sg_root2.clone().lookup_node("/value_editbox").unwrap();
|
|
|
|
|
+ node.set_property_str(atom, Role::App, "text", setting2.value_as_string())
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+
|
|
|
|
|
+ update_setting(
|
|
|
|
|
+ setting2.clone(),
|
|
|
|
|
+ sg_root2.clone(),
|
|
|
|
|
+ active_setting2.clone(),
|
|
|
|
|
+ editz_text2.clone(),
|
|
|
|
|
+ )
|
|
|
|
|
+ .await;
|
|
|
|
|
+ refresh_setting(setting2.clone(), sg_root2.clone());
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ app.tasks.lock().unwrap().push(listen_click);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
let settings_node = app.sg_root.clone().lookup_node("/window/settings_layer").unwrap();
|
|
let settings_node = app.sg_root.clone().lookup_node("/window/settings_layer").unwrap();
|
|
|
settings_node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
settings_node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
|
|
|
|
|
|
- let path = "/window/settings_layer/settings";
|
|
|
|
|
- let node = app.sg_root.clone().lookup_node(path.to_string()).unwrap();
|
|
|
|
|
|
|
+ // Searchbar results count
|
|
|
|
|
+ let node = app.sg_root.clone().lookup_node("/window/settings_layer/settings").unwrap();
|
|
|
let counter_text = node.get_children().len().to_string();
|
|
let counter_text = node.get_children().len().to_string();
|
|
|
- let path = "/window/settings_layer/search_count";
|
|
|
|
|
- let node = app.sg_root.clone().lookup_node(path.to_string()).unwrap();
|
|
|
|
|
- let _ = node.set_property_str(atom, Role::App, "text", &counter_text).unwrap();
|
|
|
|
|
|
|
+ let node = app.sg_root.clone().lookup_node("/window/settings_layer/search_count").unwrap();
|
|
|
|
|
+ node.set_property_str(atom, Role::App, "text", &counter_text).unwrap();
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+fn refresh_setting(setting: Arc<Setting>, sn: SceneNodePtr) {
|
|
|
|
|
+ let atom = &mut PropertyAtomicGuard::new();
|
|
|
|
|
+ let is_bool = matches!(setting.get_value(), PropertyValue::Bool(_));
|
|
|
|
|
+
|
|
|
|
|
+ let node = sn.clone().lookup_node("/key_label").unwrap();
|
|
|
|
|
+ if setting.clone().is_default() {
|
|
|
|
|
+ node.set_property_f32_vec(atom, Role::App, "text_color", vec![0.65, 0.87, 0.83, 1.])
|
|
|
|
|
+ .unwrap();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ node.set_property_f32_vec(atom, Role::App, "text_color", vec![1., 1., 1., 1.]).unwrap();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ let node = sn.clone().lookup_node("/reset_btn_bg").unwrap();
|
|
|
|
|
+ node.set_property_bool(atom, Role::App, "is_visible", !setting.clone().is_default()).unwrap();
|
|
|
|
|
+ let node = sn.clone().lookup_node("/reset_btn").unwrap();
|
|
|
|
|
+ node.set_property_bool(atom, Role::App, "is_active", !is_bool && !setting.clone().is_default())
|
|
|
|
|
+ .unwrap();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async fn update_setting(
|
|
async fn update_setting(
|
|
|
setting: Arc<Setting>,
|
|
setting: Arc<Setting>,
|
|
|
- sg_root: SceneNodePtr,
|
|
|
|
|
|
|
+ sn: SceneNodePtr,
|
|
|
active_setting: Arc<Mutex<Option<Arc<Setting>>>>,
|
|
active_setting: Arc<Mutex<Option<Arc<Setting>>>>,
|
|
|
editz_text: PropertyStr,
|
|
editz_text: PropertyStr,
|
|
|
) {
|
|
) {
|
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
let atom = &mut PropertyAtomicGuard::new();
|
|
|
- let setting_name = &setting.clone().name;
|
|
|
|
|
|
|
|
|
|
- let path = format!("/window/settings_layer/settings/{}/value_editbox", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/value_editbox") {
|
|
|
node.set_property_f32(atom, Role::App, "font_size", 0.).unwrap();
|
|
node.set_property_f32(atom, Role::App, "font_size", 0.).unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_active", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_active", false).unwrap();
|
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_focused", false).unwrap();
|
|
@@ -1566,16 +1558,13 @@ async fn update_setting(
|
|
|
let value_str = editz_text.get();
|
|
let value_str = editz_text.get();
|
|
|
let parsed = value_str.parse::<u32>();
|
|
let parsed = value_str.parse::<u32>();
|
|
|
if let Ok(value) = parsed {
|
|
if let Ok(value) = parsed {
|
|
|
- let path = format!("/window/settings_layer/settings/{}/value_label", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/value_label") {
|
|
|
node.set_property_str(atom, Role::App, "text", value_str).unwrap();
|
|
node.set_property_str(atom, Role::App, "text", value_str).unwrap();
|
|
|
}
|
|
}
|
|
|
- let path =
|
|
|
|
|
- format!("/window/settings_layer/settings/{}/confirm_btn_bg", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/confirm_btn_bg") {
|
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
|
}
|
|
}
|
|
|
- setting.node.set_property_u32(atom, Role::User, "value", value);
|
|
|
|
|
|
|
+ setting.node.set_property_u32(atom, Role::User, "value", value).unwrap();
|
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
|
*active_setting_value = None;
|
|
*active_setting_value = None;
|
|
|
}
|
|
}
|
|
@@ -1584,31 +1573,26 @@ async fn update_setting(
|
|
|
let value_str = editz_text.get();
|
|
let value_str = editz_text.get();
|
|
|
let parsed = value_str.parse::<f32>();
|
|
let parsed = value_str.parse::<f32>();
|
|
|
if let Ok(value) = parsed {
|
|
if let Ok(value) = parsed {
|
|
|
- let path = format!("/window/settings_layer/settings/{}/value_label", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/value_label") {
|
|
|
node.set_property_str(atom, Role::App, "text", value_str).unwrap();
|
|
node.set_property_str(atom, Role::App, "text", value_str).unwrap();
|
|
|
}
|
|
}
|
|
|
- let path =
|
|
|
|
|
- format!("/window/settings_layer/settings/{}/confirm_btn_bg", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/confirm_btn_bg") {
|
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
|
}
|
|
}
|
|
|
- setting.node.set_property_f32(atom, Role::User, "value", value);
|
|
|
|
|
|
|
+ setting.node.set_property_f32(atom, Role::User, "value", value).unwrap();
|
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
|
*active_setting_value = None;
|
|
*active_setting_value = None;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
PropertyValue::Str(_) => {
|
|
PropertyValue::Str(_) => {
|
|
|
let value_str = editz_text.get();
|
|
let value_str = editz_text.get();
|
|
|
- let path = format!("/window/settings_layer/settings/{}/value_label", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/value_label") {
|
|
|
node.set_property_str(atom, Role::App, "text", &value_str).unwrap();
|
|
node.set_property_str(atom, Role::App, "text", &value_str).unwrap();
|
|
|
}
|
|
}
|
|
|
- let path = format!("/window/settings_layer/{}/confirm_btn_bg", setting_name);
|
|
|
|
|
- if let Some(node) = sg_root.clone().lookup_node(path) {
|
|
|
|
|
|
|
+ if let Some(node) = sn.clone().lookup_node("/confirm_btn_bg") {
|
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
|
|
|
}
|
|
}
|
|
|
- setting.node.set_property_str(atom, Role::User, "value", value_str);
|
|
|
|
|
|
|
+ setting.node.set_property_str(atom, Role::User, "value", value_str).unwrap();
|
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
let mut active_setting_value = active_setting.lock().unwrap();
|
|
|
*active_setting_value = None;
|
|
*active_setting_value = None;
|
|
|
}
|
|
}
|