github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-10 23:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

app: cargo fmt

Browse Source
This commit is contained in:
darkfi
2025-06-29 11:04:20 +02:00
parent 53ca281102
commit 72c1cff8b4
24 changed files with 137 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/app/src/app/mod.rs
View File

@@ -29,10 +29,7 @@ use crate::{
error::Error,
gfx::{EpochIndex, GraphicsEventPublisherPtr, RenderApi},
plugin::PluginSettings,
prop::{
Property, PropertyAtomicGuard, PropertySubType, PropertyType,
PropertyValue, Role,
},
prop::{Property, PropertyAtomicGuard, PropertySubType, PropertyType, PropertyValue, Role},
scene::{Pimpl, SceneNode, SceneNodePtr, SceneNodeType},
text::TextShaperPtr,
ui::{chatview, Window},

124
bin/app/src/app/schema/chat.rs
View File

@@ -23,8 +23,8 @@ use std::time::UNIX_EPOCH;
use crate::{
app::{
node::{
create_button, create_chatedit, create_chatview, create_emoji_picker,
create_layer, create_shortcut, create_text, create_vector_art,
create_button, create_chatedit, create_chatview, create_emoji_picker, create_layer,
create_shortcut, create_text, create_vector_art,
},
App,
},
@@ -37,8 +37,8 @@ use crate::{
scene::{Pimpl, SceneNodePtr, Slot},
shape,
ui::{
chatview, emoji_picker, Button, ChatEdit, ChatView, EmojiPicker, Layer,
Shortcut, Text, VectorArt, VectorShape,
chatview, emoji_picker, Button, ChatEdit, ChatView, EmojiPicker, Layer, Shortcut, Text,
VectorArt, VectorShape,
},
util::unixtime,
};
@@ -217,8 +217,7 @@ pub async fn make(
prop.clone().set_expr(atom, Role::App, 3, expr::load_var("h")).unwrap();
layer_node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
layer_node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
window.link(layer_node.clone());
// Create the toolbar bg
@@ -257,8 +256,7 @@ pub async fn make(
sep_color,
);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the send button
@@ -271,8 +269,7 @@ pub async fn make(
node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
let shape = shape::create_back_arrow().scaled(BACKARROW_SCALE);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the back button
@@ -363,15 +360,7 @@ pub async fn make(
}
node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the emoji picker
@@ -391,15 +380,7 @@ pub async fn make(
//node.set_property_f32(atom, Role::App, "font_size", FONTSIZE).unwrap();
node.set_property_f32(atom, Role::App, "emoji_size", EMOJI_PICKER_ICON_SIZE).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
let node = node
.setup(|me| {
EmojiPicker::new(
me,
app.render_api.clone(),
emoji_meshes,
)
})
.await;
let node = node.setup(|me| EmojiPicker::new(me, app.render_api.clone(), emoji_meshes)).await;
let emoji_picker_node = node.clone();
layer_node.clone().link(node);
@@ -439,8 +420,7 @@ pub async fn make(
// expr::load_var("h"),
// [0.41, 0.6, 0.65, 1.],
//);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Main content view
@@ -456,8 +436,7 @@ pub async fn make(
layer_node.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
layer_node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
layer_node.set_property_u32(atom, Role::App, "priority", 1).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
chat_layer_node.clone().link(layer_node.clone());
// ChatView
@@ -629,8 +608,7 @@ pub async fn make(
// expr::load_var("h"),
// [0.41, 0.6, 0.65, 1.],
//);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the send button
@@ -644,8 +622,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 500.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 5).unwrap();
let shape = shape::create_send_arrow().scaled(EMOJI_SCALE);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the emoji button
@@ -663,8 +640,7 @@ pub async fn make(
ColorScheme::PaperLight => [0., 0., 0., 1.],
};
let shape = shape::create_emoji_selector(color).scaled(EMOJI_SCALE);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the emoji button
@@ -679,8 +655,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 500.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 5).unwrap();
let shape = shape::create_close_icon().scaled(EMOJI_CLOSE_SCALE);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Text edit
@@ -792,15 +767,8 @@ pub async fn make(
//});
//tasks.push(task);
let node = node
.setup(|me| {
ChatEdit::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node =
node.setup(|me| ChatEdit::new(me, window_scale.clone(), app.render_api.clone())).await;
let chatedit_node = node.clone();
layer_node.clone().link(node);
@@ -1051,8 +1019,7 @@ pub async fn make(
prop.add_depend(&editbox_bg_rect_prop, 1, "editz_bg_top_y");
cmd_layer_node.set_property_bool(atom, Role::App, "is_visible", false).unwrap();
cmd_layer_node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
let cmd_layer_node =
cmd_layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let cmd_layer_node = cmd_layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
layer_node.clone().link(cmd_layer_node.clone());
let cmd_hint_is_visible =
@@ -1124,8 +1091,7 @@ pub async fn make(
[0.29, 0.51, 0.45, 1.],
);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
cmd_layer_node.clone().link(node);
// Create some text
@@ -1146,15 +1112,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
cmd_layer_node.clone().link(node);
// Create some text
@@ -1175,15 +1133,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
cmd_layer_node.clone().link(node);
// Create debug box
@@ -1231,8 +1181,7 @@ pub async fn make(
layer_node.set_property_u32(atom, Role::App, "z_index", 8).unwrap();
// Priority higher than chatview but lower than chatedit
layer_node.set_property_u32(atom, Role::App, "priority", 1).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
content_layer_node.clone().link(layer_node.clone());
let actions_is_visible = PropertyBool::wrap(&layer_node, Role::App, "is_visible", 0).unwrap();
@@ -1310,8 +1259,7 @@ pub async fn make(
hicolor,
);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create some text
@@ -1332,15 +1280,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
layer_node.clone().link(node);
// Copy button
@@ -1438,8 +1378,7 @@ pub async fn make(
layer_node.set_property_u32(atom, Role::App, "z_index", 8).unwrap();
// Priority higher than chatview but lower than chatedit
layer_node.set_property_u32(atom, Role::App, "priority", 1).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
content_layer_node.link(layer_node.clone());
let pasta_is_visible = PropertyBool::wrap(&layer_node, Role::App, "is_visible", 0).unwrap();
@@ -1490,8 +1429,7 @@ pub async fn make(
hicolor.clone(),
);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create some text
@@ -1512,15 +1450,7 @@ pub async fn make(
prop.clone().set_f32(atom, Role::App, 3, 1.).unwrap();
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
layer_node.clone().link(node);
// Paste button

46
bin/app/src/app/schema/menu.rs
View File

@@ -18,22 +18,13 @@
use crate::{
app::{
node::{
create_button,
create_layer, create_shortcut, create_text, create_vector_art,
},
node::{create_button, create_layer, create_shortcut, create_text, create_vector_art},
App,
},
expr,
prop::{
PropertyAtomicGuard, PropertyBool, PropertyFloat32,
Role,
},
prop::{PropertyAtomicGuard, PropertyBool, PropertyFloat32, Role},
scene::{SceneNodePtr, Slot},
ui::{
Button, Layer, ShapeVertex, Shortcut, Text, VectorArt,
VectorShape,
},
ui::{Button, Layer, ShapeVertex, Shortcut, Text, VectorArt, VectorShape},
};
use super::{ColorScheme, CHANNELS, COLOR_SCHEME};
@@ -88,8 +79,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
prop.clone().set_expr(atom, Role::App, 3, expr::load_var("h")).unwrap();
layer_node.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
layer_node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
window.link(layer_node.clone());
// Channels label bg
@@ -129,8 +119,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
[0.15, 0.2, 0.19, 1.],
);
let node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Create some text
@@ -159,15 +148,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
}
node.set_property_u32(atom, Role::App, "z_index", 1).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node = node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
layer_node.clone().link(node);
let mut channel_y = CHANNEL_LABEL_LINESPACE;
@@ -205,9 +186,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
sep_color,
);
let node = node
.setup(|me| VectorArt::new(me, shape, app.render_api.clone()))
.await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
// Desktop platforms
@@ -246,15 +225,8 @@ pub async fn make(app: &App, window: SceneNodePtr) {
set_normal_color(atom);
node.set_property_u32(atom, Role::App, "z_index", 3).unwrap();
let node = node
.setup(|me| {
Text::new(
me,
window_scale.clone(),
app.render_api.clone(),
)
})
.await;
let node =
node.setup(|me| Text::new(me, window_scale.clone(), app.render_api.clone())).await;
layer_node.clone().link(node);
// Create the button

39
bin/app/src/app/schema/mod.rs
View File

@@ -22,21 +22,14 @@ use std::fs::File;
use crate::{
app::{
node::{
create_image, create_layer, create_shortcut, create_vector_art,
},
node::{create_image, create_layer, create_shortcut, create_vector_art},
App,
},
expr::{self, Compiler},
prop::{
PropertyAtomicGuard, Role,
},
prop::{PropertyAtomicGuard, Role},
scene::{SceneNodePtr, Slot},
shape,
ui::{
emoji_picker, Image, Layer,
Shortcut, VectorArt, VectorShape,
},
ui::{emoji_picker, Image, Layer, Shortcut, VectorArt, VectorShape},
};
mod chat;
@@ -231,8 +224,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
prop.clone().set_expr(atom, Role::App, 3, expr::load_var("h")).unwrap();
layer_node.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
layer_node.set_property_u32(atom, Role::App, "z_index", 0).unwrap();
let layer_node =
layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let layer_node = layer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
window.clone().link(layer_node.clone());
// Create a bg image
@@ -297,9 +289,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
expr::load_var("h"),
[c, c, c, 0.3],
);
let node = node
.setup(|me| VectorArt::new(me, shape, app.render_api.clone()))
.await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
layer_node.clone().link(node);
} else if COLOR_SCHEME == ColorScheme::PaperLight {
let node = create_vector_art("bg");
@@ -320,9 +310,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
expr::load_var("h"),
[c, c, c, 0.3],
);
let node = node
.setup(|me| VectorArt::new(me, shape, app.render_api.clone()))
.await;
let node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
window.clone().link(node);
}
@@ -337,8 +325,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
prop.clone().set_f32(atom, Role::App, 3, 1000.).unwrap();
netlayer_node.set_property_bool(atom, Role::App, "is_visible", true).unwrap();
netlayer_node.set_property_u32(atom, Role::App, "z_index", 2).unwrap();
let netlayer_node =
netlayer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
let netlayer_node = netlayer_node.setup(|me| Layer::new(me, app.render_api.clone())).await;
window.clone().link(netlayer_node.clone());
let node = create_vector_art("net0");
@@ -352,8 +339,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
let mut shape = shape::create_netlogo1([1., 0., 0.25, 1.]).scaled(NETLOGO_SCALE);
shape.join(shape::create_netlogo2([0.27, 0.4, 0.4, 1.]).scaled(NETLOGO_SCALE));
shape.join(shape::create_netlogo3([0.27, 0.4, 0.4, 1.]).scaled(NETLOGO_SCALE));
let net0_node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let net0_node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
netlayer_node.clone().link(net0_node);
let node = create_vector_art("net1");
@@ -367,8 +353,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
let mut shape = shape::create_netlogo1([0.49, 0.57, 1., 1.]).scaled(NETLOGO_SCALE);
shape.join(shape::create_netlogo2([0.49, 0.57, 1., 1.]).scaled(NETLOGO_SCALE));
shape.join(shape::create_netlogo3([0.27, 0.4, 0.4, 1.]).scaled(NETLOGO_SCALE));
let net1_node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let net1_node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
netlayer_node.clone().link(net1_node);
let node = create_vector_art("net2");
@@ -382,8 +367,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
let mut shape = shape::create_netlogo1([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE);
shape.join(shape::create_netlogo2([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE));
shape.join(shape::create_netlogo3([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE));
let net2_node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let net2_node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
netlayer_node.clone().link(net2_node);
let node = create_vector_art("net3");
@@ -397,8 +381,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
let mut shape = shape::create_netlogo1([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE);
shape.join(shape::create_netlogo2([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE));
shape.join(shape::create_netlogo3([0., 0.94, 1., 1.]).scaled(NETLOGO_SCALE));
let net3_node =
node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
let net3_node = node.setup(|me| VectorArt::new(me, shape, app.render_api.clone())).await;
netlayer_node.clone().link(net3_node);
// Navbar Settings Button

2
bin/app/src/logger.rs
View File

@@ -25,7 +25,7 @@ use simplelog::{
use {
file_rotate::{compression::Compression, suffix::AppendCount, ContentLimit, FileRotate},
simplelog::WriteLogger,
std::{path::PathBuf, thread::sleep, time::Duration}
std::{path::PathBuf, thread::sleep, time::Duration},
};
// Measured in bytes

20
bin/app/src/main.rs
View File

@@ -60,23 +60,21 @@ mod util;
use crate::{
app::{App, AppPtr},
gfx::EpochIndex,
prop::{
Property, PropertySubType, PropertyType,
},
prop::{Property, PropertySubType, PropertyType},
scene::{CallArgType, SceneNode, SceneNodeType},
text::TextShaper,
util::AsyncRuntime,
};
#[cfg(feature = "enable-plugins")]
use {
scene::{SceneNodePtr, Slot},
prop::{PropertyStr, Role, PropertyAtomicGuard, PropertyBool},
ui::chatview,
std::io::Cursor,
darkfi_serial::{Encodable, Decodable, deserialize},
};
#[cfg(feature = "enable-netdebug")]
use net::ZeroMQAdapter;
#[cfg(feature = "enable-plugins")]
use {
darkfi_serial::{deserialize, Decodable, Encodable},
prop::{PropertyAtomicGuard, PropertyBool, PropertyStr, Role},
scene::{SceneNodePtr, Slot},
std::io::Cursor,
ui::chatview,
};
// This is historical, but ideally we can fix the entire project and remove this import.
pub use util::ExecutorPtr;

5
bin/app/src/mesh.rs
View File

@@ -17,9 +17,8 @@
*/
use crate::gfx::{
DebugTag, GfxDrawMesh, ManagedBufferPtr, ManagedTexturePtr, Point, Rectangle, RenderApi,
Vertex,
};
DebugTag, GfxDrawMesh, ManagedBufferPtr, ManagedTexturePtr, Point, Rectangle, RenderApi, Vertex,
};
pub type Color = [f32; 4];

5
bin/app/src/net.rs
View File

@@ -18,10 +18,7 @@
use async_lock::Mutex;
use darkfi_serial::{async_trait, deserialize, Decodable, Encodable, SerialDecodable, VarInt};
use std::{
io::Cursor,
sync::Arc
};
use std::{io::Cursor, sync::Arc};
use zeromq::{Socket, SocketRecv, SocketSend};
use crate::{

78
bin/app/src/plugin/mod.rs
View File

@@ -16,9 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
use std::{sync::Arc,
array::TryFromSliceError, string::FromUtf8Error};
use sled_overlay::sled;
use std::{array::TryFromSliceError, string::FromUtf8Error, sync::Arc};
pub mod darkirc;
pub use darkirc::{DarkIrc, DarkIrcPtr};
@@ -26,10 +25,7 @@ pub use darkirc::{DarkIrc, DarkIrcPtr};
use darkfi::net::Settings as NetSettings;
use crate::{
prop::{
Property, PropertyAtomicGuard, PropertySubType, PropertyType,
PropertyValue, Role,
},
prop::{Property, PropertyAtomicGuard, PropertySubType, PropertyType, PropertyValue, Role},
scene::{SceneNode, SceneNodePtr, SceneNodeType},
};
@@ -107,12 +103,9 @@ impl PluginSettings {
PropertyType::Bool => {
let sled_result = self.sled_tree.get(setting_node.name.as_str());
if let Ok(Some(sled_value)) = sled_result {
setting_node.set_property_bool(
atom,
Role::User,
"value",
sled_value[0] != 0,
).unwrap();
setting_node
.set_property_bool(atom, Role::User, "value", sled_value[0] != 0)
.unwrap();
}
}
PropertyType::Uint32 => {
@@ -122,12 +115,14 @@ impl PluginSettings {
let bytes: Result<[u8; 4], TryFromSliceError> =
sled_value.as_ref().try_into();
if let Ok(b) = bytes {
setting_node.set_property_u32(
atom,
Role::User,
"value",
u32::from_le_bytes(b),
).unwrap();
setting_node
.set_property_u32(
atom,
Role::User,
"value",
u32::from_le_bytes(b),
)
.unwrap();
}
}
}
@@ -139,12 +134,14 @@ impl PluginSettings {
let bytes: Result<[u8; 4], TryFromSliceError> =
sled_value.as_ref().try_into();
if let Ok(b) = bytes {
setting_node.set_property_f32(
atom,
Role::User,
"value",
f32::from_le_bytes(b),
).unwrap();
setting_node
.set_property_f32(
atom,
Role::User,
"value",
f32::from_le_bytes(b),
)
.unwrap();
}
}
}
@@ -176,25 +173,32 @@ impl PluginSettings {
PropertyType::Bool => {
let value_bytes = if value.get_bool(0).unwrap() { 1u8 } else { 0u8 };
self.sled_tree
.insert(setting_node.name.as_str(), sled::IVec::from(vec![value_bytes])).unwrap();
.insert(setting_node.name.as_str(), sled::IVec::from(vec![value_bytes]))
.unwrap();
}
PropertyType::Uint32 => {
self.sled_tree.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_u32(0).unwrap().to_le_bytes().as_ref()),
).unwrap();
self.sled_tree
.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_u32(0).unwrap().to_le_bytes().as_ref()),
)
.unwrap();
}
PropertyType::Float32 => {
self.sled_tree.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_f32(0).unwrap().to_le_bytes().as_ref()),
).unwrap();
self.sled_tree
.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_f32(0).unwrap().to_le_bytes().as_ref()),
)
.unwrap();
}
PropertyType::Str => {
self.sled_tree.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_str(0).unwrap().as_bytes()),
).unwrap();
self.sled_tree
.insert(
setting_node.name.as_str(),
sled::IVec::from(value.get_str(0).unwrap().as_bytes()),
)
.unwrap();
}
_ => {}
}

4
bin/app/src/prop/mod.rs
View File

@@ -33,8 +33,8 @@ mod guard;
pub use guard::PropertyAtomicGuard;
mod wrap;
pub use wrap::{
PropertyBool, PropertyColor, PropertyDimension, PropertyFloat32, PropertyRect,
PropertyStr, PropertyUint32,
PropertyBool, PropertyColor, PropertyDimension, PropertyFloat32, PropertyRect, PropertyStr,
PropertyUint32,
};
#[derive(Debug, Copy, Clone, PartialEq, SerialEncodable, SerialDecodable)]

4
bin/app/src/text/atlas.rs
View File

@@ -16,9 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
use crate::{
gfx::{DebugTag, ManagedTexturePtr, Rectangle, RenderApi},
};
use crate::gfx::{DebugTag, ManagedTexturePtr, Rectangle, RenderApi};
use super::{
ft::{Sprite, SpritePtr},

12
bin/app/src/ui/chatedit.rs
View File

@@ -32,10 +32,11 @@ use std::{
},
};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use crate::{
gfx::{
gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh,
Point, Rectangle, RenderApi, Vertex,
gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, Point, Rectangle, RenderApi, Vertex,
},
mesh::MeshBuilder,
prop::{
@@ -47,8 +48,6 @@ use crate::{
util::unixtime,
ExecutorPtr,
};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use super::{
baseedit::{
@@ -907,10 +906,7 @@ impl ChatEdit {
fn finish_select(&self, atom: &mut PropertyAtomicGuard) {
self.is_phone_select.store(false, Ordering::Relaxed);
self.hide_cursor.store(false, Ordering::Relaxed);
self.select_text
.clone()
.set_null(atom, Role::Internal, 0)
.unwrap();
self.select_text.clone().set_null(atom, Role::Internal, 0).unwrap();
}
/// Whenever the cursor is modified this MUST be called

9
bin/app/src/ui/chatview/mod.rs
View File

@@ -38,13 +38,10 @@ mod page;
use page::MessageBuffer;
use crate::{
gfx::{
GfxDrawCall, GfxDrawInstruction, Point, Rectangle,
RenderApi,
},
gfx::{GfxDrawCall, GfxDrawInstruction, Point, Rectangle, RenderApi},
prop::{
PropertyAtomicGuard, PropertyBool, PropertyColor, PropertyFloat32,
PropertyRect, PropertyUint32, Role,
PropertyAtomicGuard, PropertyBool, PropertyColor, PropertyFloat32, PropertyRect,
PropertyUint32, Role,
},
scene::{MethodCallSub, Pimpl, SceneNodeWeak},
text::TextShaperPtr,

5
bin/app/src/ui/chatview/page.rs
View File

@@ -27,10 +27,7 @@ use std::{
use super::{max, MessageId, Timestamp};
use crate::{
gfx::{
gfxtag, GfxDrawMesh,
Rectangle, RenderApi,
},
gfx::{gfxtag, GfxDrawMesh, Rectangle, RenderApi},
mesh::{Color, MeshBuilder, COLOR_BLUE, COLOR_PINK, COLOR_WHITE},
prop::{PropertyBool, PropertyColor, PropertyFloat32, PropertyPtr},
text::{self, Glyph, GlyphPositionIter, TextShaper, TextShaperPtr},

5
bin/app/src/ui/emoji_picker/emoji.rs
View File

@@ -25,10 +25,7 @@ use std::{
};
use crate::{
gfx::{
gfxtag, GfxDrawMesh,
Rectangle, RenderApi,
},
gfx::{gfxtag, GfxDrawMesh, Rectangle, RenderApi},
mesh::{MeshBuilder, COLOR_WHITE},
text::{self, TextShaperPtr},
};

16
bin/app/src/ui/emoji_picker/mod.rs
View File

@@ -22,19 +22,13 @@ use miniquad::{MouseButton, TouchPhase};
use parking_lot::Mutex as SyncMutex;
use rand::{rngs::OsRng, Rng};
use std::sync::{
atomic::{AtomicBool, Ordering},
Arc,
};
atomic::{AtomicBool, Ordering},
Arc,
};
use crate::{
gfx::{
GfxDrawCall, GfxDrawInstruction, Point,
Rectangle, RenderApi,
},
prop::{
PropertyAtomicGuard, PropertyFloat32, PropertyRect,
PropertyUint32, Role,
},
gfx::{GfxDrawCall, GfxDrawInstruction, Point, Rectangle, RenderApi},
prop::{PropertyAtomicGuard, PropertyFloat32, PropertyRect, PropertyUint32, Role},
scene::{Pimpl, SceneNodeWeak},
util::unixtime,
ExecutorPtr,

4
bin/app/src/ui/gesture.rs
View File

@@ -23,9 +23,7 @@ use std::sync::{Arc, Mutex as SyncMutex};
use crate::{
gfx::Point,
prop::{
PropertyUint32, Role,
},
prop::{PropertyUint32, Role},
scene::{Pimpl, SceneNodeWeak},
};

9
bin/app/src/ui/image.rs
View File

@@ -20,15 +20,12 @@ use async_trait::async_trait;
use image::ImageReader;
use parking_lot::Mutex as SyncMutex;
use rand::{rngs::OsRng, Rng};
use std::{
io::Cursor,
sync::Arc,
};
use std::{io::Cursor, sync::Arc};
use crate::{
gfx::{
gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, ManagedTexturePtr,
Rectangle, RenderApi,
gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, ManagedTexturePtr, Rectangle,
RenderApi,
},
mesh::{MeshBuilder, MeshInfo, COLOR_WHITE},
prop::{PropertyAtomicGuard, PropertyRect, PropertyStr, PropertyUint32, Role},

9
bin/app/src/ui/layer.rs
View File

@@ -22,18 +22,15 @@ use parking_lot::Mutex as SyncMutex;
use rand::{rngs::OsRng, Rng};
use std::sync::Arc;
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use crate::{
gfx::{GfxDrawCall, GfxDrawInstruction, Point, Rectangle, RenderApi},
prop::{
PropertyAtomicGuard, PropertyBool, PropertyRect,
PropertyUint32, Role,
},
prop::{PropertyAtomicGuard, PropertyBool, PropertyRect, PropertyUint32, Role},
scene::{Pimpl, SceneNodePtr, SceneNodeWeak},
util::unixtime,
ExecutorPtr,
};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use super::{
get_children_ordered, get_ui_object3, get_ui_object_ptr, DrawUpdate, OnModify, UIObject,

4
bin/app/src/ui/mod.rs
View File

@@ -21,14 +21,14 @@ use futures::stream::{FuturesUnordered, StreamExt};
use miniquad::{KeyCode, KeyMods, MouseButton, TouchPhase};
use std::sync::{Arc, Weak};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use crate::{
gfx::{GfxDrawCall, Point, Rectangle},
prop::{ModifyAction, PropertyAtomicGuard, PropertyPtr, Role},
scene::{Pimpl, SceneNode as SceneNode3, SceneNodePtr, SceneNodeWeak},
ExecutorPtr,
};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
mod button;
pub use button::{Button, ButtonPtr};

5
bin/app/src/ui/shortcut.rs
View File

@@ -21,10 +21,7 @@ use miniquad::{KeyCode, KeyMods};
use std::sync::Arc;
use crate::{
prop::{
PropertyPtr,
PropertyUint32, Role,
},
prop::{PropertyPtr, PropertyUint32, Role},
scene::{Pimpl, SceneNodeWeak},
};

9
bin/app/src/ui/text.rs
View File

@@ -22,13 +22,10 @@ use rand::{rngs::OsRng, Rng};
use std::sync::Arc;
use crate::{
gfx::{
gfxtag, GfxDrawCall, GfxDrawInstruction,
Rectangle, RenderApi,
},
gfx::{gfxtag, GfxDrawCall, GfxDrawInstruction, Rectangle, RenderApi},
prop::{
PropertyAtomicGuard, PropertyBool, PropertyColor, PropertyFloat32,
PropertyRect, PropertyStr, PropertyUint32, Role,
PropertyAtomicGuard, PropertyBool, PropertyColor, PropertyFloat32, PropertyRect,
PropertyStr, PropertyUint32, Role,
},
scene::{Pimpl, SceneNodeWeak},
text2::{self, TEXT_CTX},

15
bin/app/src/ui/vector_art/mod.rs
View File

@@ -22,13 +22,8 @@ use rand::{rngs::OsRng, Rng};
use std::sync::Arc;
use crate::{
gfx::{
gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, Rectangle, RenderApi,
},
prop::{
PropertyAtomicGuard, PropertyBool, PropertyRect,
PropertyUint32, Role,
},
gfx::{gfxtag, GfxDrawCall, GfxDrawInstruction, GfxDrawMesh, Rectangle, RenderApi},
prop::{PropertyAtomicGuard, PropertyBool, PropertyRect, PropertyUint32, Role},
scene::{Pimpl, SceneNodeWeak},
util::unixtime,
ExecutorPtr,
@@ -60,11 +55,7 @@ pub struct VectorArt {
}
impl VectorArt {
pub async fn new(
node: SceneNodeWeak,
shape: VectorShape,
render_api: RenderApi,
) -> Pimpl {
pub async fn new(node: SceneNodeWeak, shape: VectorShape, render_api: RenderApi) -> Pimpl {
t!("VectorArt::new()");
let node_ref = &node.upgrade().unwrap();

4
bin/app/src/ui/win.rs
View File

@@ -20,6 +20,8 @@ use miniquad::{KeyCode, KeyMods, MouseButton, TouchPhase};
use parking_lot::Mutex as SyncMutex;
use std::sync::{Arc, Weak};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use crate::{
gfx::{
GfxDrawCall, GfxDrawInstruction, GraphicsEventCharSub, GraphicsEventKeyDownSub,
@@ -32,8 +34,6 @@ use crate::{
util::unixtime,
ExecutorPtr,
};
#[cfg(target_os = "android")]
use crate::AndroidSuggestEvent;
use super::{get_children_ordered, get_ui_object3, get_ui_object_ptr, OnModify};