Skip to content

upd: add reset effect node to list/tree view #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Joezeo merged 1 commit into from
May 20, 2025
Merged

upd: add reset effect node to list/tree view #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/input_element/holder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ impl ObjectImpl for Holder {
];
self.select1.set_options(&options);
self.select1.set_margin_left(20);
self.select1.set_reset_effect_node_on_hide(true);

self.select2.set_options(&options);
self.select2.set_margin_left(20);
Expand Down
37 changes: 36 additions & 1 deletion macros/src/extend_container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ pub(crate) fn expand(
let inner_on_property_set_clause = if layout.is(LayoutType::Stack) {
generate_stack_inner_on_property_set()?
} else {
quote!(false)
generate_container_inner_on_property_set()?
};

Ok(quote!(
Expand Down Expand Up @@ -538,3 +538,38 @@ pub(crate) fn gen_container_trait_impl_clause(
}
))
}

pub(crate) fn generate_container_inner_on_property_set() -> syn::Result<proc_macro2::TokenStream> {
Ok(quote! {
match name {
"visible" => {
let visible = value.get::<bool>();
emit!(self, visibility_changed(visible));
self.inner_visibility_changed(visible);
self.on_visibility_changed(visible);

if !self.children().is_empty() {
for child in self.children_mut().iter_mut() {
if visible {
if !child.visibility_check() {
continue;
}
if let Some(iv) = cast!(child as IsolatedVisibility) {
if iv.auto_hide() {
continue;
}
}

child.set_property("visible", true.to_value());
child.set_render_styles(true);
} else {
child.set_property("visible", false.to_value());
}
}
}
true
}
_ => false,
}
})
}
31 changes: 31 additions & 0 deletions macros/src/extend_popup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,37 @@ pub(crate) fn expand(
let window = ApplicationWindow::window();
connect!(window, size_changed(), self, on_win_size_change(Size));
}

#[inline]
fn inner_on_property_set(&mut self, name: &str, value: &Value) -> bool {
match name {
"visible" => {
let visible = value.get::<bool>();
emit!(self, visibility_changed(visible));
self.inner_visibility_changed(visible);
self.on_visibility_changed(visible);
if let Some(child) = self.get_child_mut() {
if visible {
if !child.visibility_check() {
return true;
}
if let Some(iv) = cast!(child as IsolatedVisibility) {
if iv.auto_hide() {
return true;
}
}

child.set_property("visible", true.to_value());
child.set_render_styles(true);
} else {
child.set_property("visible", false.to_value());
}
}
true
}
_ => false,
}
}
}

impl #impl_generics PointEffective for #name #ty_generics #where_clause {
Expand Down
31 changes: 31 additions & 0 deletions macros/src/extend_widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,37 @@ pub(crate) fn expand_with_general_attr(
fn pretreat_construct(&mut self) {
#child_ref_clause
}

#[inline]
fn inner_on_property_set(&mut self, name: &str, value: &Value) -> bool {
match name {
"visible" => {
let visible = value.get::<bool>();
emit!(self, visibility_changed(visible));
self.inner_visibility_changed(visible);
self.on_visibility_changed(visible);
if let Some(child) = self.get_child_mut() {
if visible {
if !child.visibility_check() {
return true;
}
if let Some(iv) = cast!(child as IsolatedVisibility) {
if iv.auto_hide() {
return true;
}
}

child.set_property("visible", true.to_value());
child.set_render_styles(true);
} else {
child.set_property("visible", false.to_value());
}
}
true
}
_ => false,
}
}
}

impl #impl_generics PointEffective for #name #ty_generics #where_clause {
Expand Down
7 changes: 7 additions & 0 deletions tmui/src/input/select/dropdown_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ impl DropdownList {
pub(crate) fn trans_focus_take(&mut self, strat: FocusStrat) {
self.list.take_over_focus(strat);
}

#[cfg(not(win_select))]
#[inline]
pub(crate) fn set_reset_effect_node_on_hide(&mut self, reset_effect_node_on_hide: bool) {
self.list
.set_reset_effect_node_on_hide(reset_effect_node_on_hide);
}
}

#[cfg(win_select)]
Expand Down
6 changes: 6 additions & 0 deletions tmui/src/input/select/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,12 @@ impl<T: SelectBounds> Select<T> {
.unwrap()
}

#[inline]
pub fn set_reset_effect_node_on_hide(&mut self, reset_effect_node_on_hide: bool) {
self.dropdown_list_mut()
.set_reset_effect_node_on_hide(reset_effect_node_on_hide);
}

#[cfg(win_select)]
#[inline]
pub fn dropdown_list(&self) -> &CorrDropdownList {
Expand Down
20 changes: 19 additions & 1 deletion tmui/src/views/list_view/list_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ use super::{
list_view_object::ListViewObject,
WidgetHnd,
};
use crate::{views::list_view::list_item::ListItemCast, widget::WidgetImpl};
use crate::{
views::{list_view::list_item::ListItemCast, node::Status},
widget::WidgetImpl,
};
use nohash_hasher::IntMap;
use once_cell::sync::Lazy;
use std::{
Expand Down Expand Up @@ -331,6 +334,21 @@ impl ListStore {
}
}

#[inline]
pub(crate) fn remove_effected_node_status(&mut self) {
if self.entered_node.is_some() {
self.entered_node = None;
}
if self.hovered_node.is_some() {
nonnull_mut!(self.hovered_node).remove_status(Status::Hovered);
self.hovered_node = None;
}
if self.selected_node.is_some() {
nonnull_mut!(self.selected_node).remove_status(Status::Selected);
self.selected_node = None;
}
}

#[inline]
pub(crate) fn set_view(&mut self, view: WidgetHnd) {
self.view = view;
Expand Down
9 changes: 9 additions & 0 deletions tmui/src/views/list_view/list_view_image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub(crate) struct ListViewImage {
pub(crate) line_spacing: i32,
#[derivative(Default(value = "MouseEffect::all()"))]
pub(crate) mouse_effect: MouseEffect,
pub(crate) reset_effect_node_on_hide: bool,

pub(crate) on_node_enter: Option<FnNodeAction>,
pub(crate) on_node_leave: Option<FnNodeAction>,
Expand Down Expand Up @@ -112,6 +113,14 @@ impl WidgetImpl for ListViewImage {
fn on_mouse_wheel(&mut self, event: &MouseEvent) {
nonnull_mut!(self.scroll_bar).on_mouse_wheel(event)
}

#[inline]
fn on_visibility_changed(&mut self, visible: bool) {
if !visible && self.reset_effect_node_on_hide {
self.store.remove_effected_node_status();
nonnull_mut!(self.scroll_bar).set_value(0);
}
}
}

impl ListViewImage {
Expand Down
5 changes: 5 additions & 0 deletions tmui/src/views/list_view/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ impl ListView {
self.get_image_mut().mouse_effect.insert(mouse_effect)
}

#[inline]
pub fn set_reset_effect_node_on_hide(&mut self, reset_effect_node_on_hide: bool) {
self.get_image_mut().reset_effect_node_on_hide = reset_effect_node_on_hide;
}

#[inline]
pub fn register_node_enter<
F: 'static + Fn(&mut ListNode, &mut ConcurrentStoreMutexGuard, &MouseEvent),
Expand Down
5 changes: 5 additions & 0 deletions tmui/src/views/tree_view/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ impl TreeView {
self.get_store_mut().set_sort_proxy(compare)
}

#[inline]
pub fn reset_effect_node(&mut self) {
self.get_image_mut().reset_effect_node();
}

#[inline]
pub fn mouse_effect(&self) -> MouseEffect {
self.get_image().mouse_effect()
Expand Down
29 changes: 22 additions & 7 deletions tmui/src/views/tree_view/tree_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub struct TreeStore {
current_line: i32,
y_offset: i32,

enterd_node: Option<NonNull<TreeNode>>,
entered_node: Option<NonNull<TreeNode>>,
hovered_node: Option<NonNull<TreeNode>>,
selected_node: Option<NonNull<TreeNode>>,

Expand Down Expand Up @@ -116,6 +116,21 @@ impl TreeStore {
}
}

#[inline]
pub(crate) fn remove_effected_node_status(&mut self) {
if self.entered_node.is_some() {
self.entered_node = None;
}
if self.hovered_node.is_some() {
nonnull_mut!(self.hovered_node).remove_status(Status::Hovered);
self.hovered_node = None;
}
if self.selected_node.is_some() {
nonnull_mut!(self.selected_node).remove_status(Status::Selected);
self.selected_node = None;
}
}

#[inline]
pub fn root(&self) -> &TreeNode {
self.root.as_ref()
Expand Down Expand Up @@ -147,7 +162,7 @@ impl TreeStore {

self.nodes_buffer.clear();
self.nodes_cache.clear();
self.enterd_node = None;
self.entered_node = None;
self.hovered_node = None;
self.selected_node = None;
}
Expand All @@ -170,7 +185,7 @@ impl TreeStore {
window_lines: 0,
current_line: 0,
y_offset: 0,
enterd_node: None,
entered_node: None,
hovered_node: None,
selected_node: None,
id_increment: IdGenerator::new(1),
Expand Down Expand Up @@ -211,8 +226,8 @@ impl TreeStore {
pub(crate) fn remove_node_cache(&mut self, id: ObjectId) {
self.nodes_cache.remove(&id);

if self.enterd_node.is_some() && nonnull_ref!(self.enterd_node).id() == id {
self.enterd_node = None;
if self.entered_node.is_some() && nonnull_ref!(self.entered_node).id() == id {
self.entered_node = None;
}

if self.selected_node.is_some() && nonnull_ref!(self.selected_node).id() == id {
Expand Down Expand Up @@ -574,12 +589,12 @@ impl TreeStore {

#[inline]
pub(crate) fn get_entered_node(&self) -> Option<NonNull<TreeNode>> {
self.enterd_node
self.entered_node
}

#[inline]
pub(crate) fn set_entered_node(&mut self, node: &mut TreeNode) {
self.enterd_node = NonNull::new(node)
self.entered_node = NonNull::new(node)
}

#[inline]
Expand Down
5 changes: 5 additions & 0 deletions tmui/src/views/tree_view/tree_view_image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,11 @@ impl TreeViewImage {
self.update();
}

#[inline]
pub(crate) fn reset_effect_node(&mut self) {
self.store.remove_effected_node_status();
}

#[inline]
pub(crate) fn register_node_pressed<T: 'static + Fn(&mut TreeNode, &MouseEvent)>(
&mut self,
Expand Down