mirror of
https://github.com/darkrenaissance/darkfi.git
synced 2026-01-09 22:57:59 -05:00
app: remove text1 refs from ChatView
This commit is contained in:
@@ -560,7 +560,6 @@ pub async fn make(
|
|||||||
chat_tree,
|
chat_tree,
|
||||||
window_scale.clone(),
|
window_scale.clone(),
|
||||||
app.render_api.clone(),
|
app.render_api.clone(),
|
||||||
app.text_shaper.clone(),
|
|
||||||
app.sg_root.clone(),
|
app.sg_root.clone(),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -364,7 +364,6 @@ pub async fn make(app: &App, window: SceneNodePtr, i18n_fish: &I18nBabelFish) {
|
|||||||
chat_tree,
|
chat_tree,
|
||||||
window_scale.clone(),
|
window_scale.clone(),
|
||||||
app.render_api.clone(),
|
app.render_api.clone(),
|
||||||
app.text_shaper.clone(),
|
|
||||||
app.sg_root.clone(),
|
app.sg_root.clone(),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ use crate::{
|
|||||||
PropertyFloat32, PropertyRect, PropertyUint32, Role,
|
PropertyFloat32, PropertyRect, PropertyUint32, Role,
|
||||||
},
|
},
|
||||||
scene::{MethodCallSub, Pimpl, SceneNodePtr, SceneNodeWeak},
|
scene::{MethodCallSub, Pimpl, SceneNodePtr, SceneNodeWeak},
|
||||||
text::TextShaperPtr,
|
|
||||||
ExecutorPtr,
|
ExecutorPtr,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -196,7 +195,6 @@ impl ChatView {
|
|||||||
tree: sled::Tree,
|
tree: sled::Tree,
|
||||||
window_scale: PropertyFloat32,
|
window_scale: PropertyFloat32,
|
||||||
render_api: RenderApi,
|
render_api: RenderApi,
|
||||||
text_shaper: TextShaperPtr,
|
|
||||||
sg_root: SceneNodePtr,
|
sg_root: SceneNodePtr,
|
||||||
) -> Pimpl {
|
) -> Pimpl {
|
||||||
let node_ref = &node.upgrade().unwrap();
|
let node_ref = &node.upgrade().unwrap();
|
||||||
@@ -254,7 +252,6 @@ impl ChatView {
|
|||||||
debug,
|
debug,
|
||||||
window_scale,
|
window_scale,
|
||||||
render_api,
|
render_api,
|
||||||
text_shaper,
|
|
||||||
)),
|
)),
|
||||||
dc_key: OsRng.gen(),
|
dc_key: OsRng.gen(),
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ use crate::{
|
|||||||
gfx::{gfxtag, DrawInstruction, ManagedTexturePtr, Point, Rectangle, RenderApi},
|
gfx::{gfxtag, DrawInstruction, ManagedTexturePtr, Point, Rectangle, RenderApi},
|
||||||
mesh::{Color, MeshBuilder, COLOR_CYAN, COLOR_GREEN, COLOR_RED, COLOR_WHITE},
|
mesh::{Color, MeshBuilder, COLOR_CYAN, COLOR_GREEN, COLOR_RED, COLOR_WHITE},
|
||||||
prop::{PropertyBool, PropertyColor, PropertyFloat32, PropertyPtr},
|
prop::{PropertyBool, PropertyColor, PropertyFloat32, PropertyPtr},
|
||||||
text::{TextShaper, TextShaperPtr},
|
|
||||||
text2,
|
text2,
|
||||||
util::enumerate_mut,
|
util::enumerate_mut,
|
||||||
};
|
};
|
||||||
@@ -725,7 +724,6 @@ pub struct MessageBuffer {
|
|||||||
old_window_scale: f32,
|
old_window_scale: f32,
|
||||||
|
|
||||||
render_api: RenderApi,
|
render_api: RenderApi,
|
||||||
text_shaper: TextShaperPtr,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MessageBuffer {
|
impl MessageBuffer {
|
||||||
@@ -743,7 +741,6 @@ impl MessageBuffer {
|
|||||||
debug: PropertyBool,
|
debug: PropertyBool,
|
||||||
window_scale: PropertyFloat32,
|
window_scale: PropertyFloat32,
|
||||||
render_api: RenderApi,
|
render_api: RenderApi,
|
||||||
text_shaper: TextShaperPtr,
|
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let old_window_scale = window_scale.get();
|
let old_window_scale = window_scale.get();
|
||||||
Self {
|
Self {
|
||||||
@@ -767,7 +764,6 @@ impl MessageBuffer {
|
|||||||
old_window_scale,
|
old_window_scale,
|
||||||
|
|
||||||
render_api,
|
render_api,
|
||||||
text_shaper,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user