mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-04 13:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix pivot showing up in default mode

Browse source
This commit is contained in:
mtvare6 2025-06-30 15:00:58 +05:30
parent eab6bbd613
commit b47c263334
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
editor/src/messages/tool/tool_messages/select_tool.rs
View file

@ -90,12 +90,6 @@ pub enum DotType {
Active,
}
impl DotType {
pub fn is_pivot(self) -> bool {
self == Self::Pivot
}
}
#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, serde::Serialize, serde::Deserialize, specta::Type)]
pub struct DotState {
enabled: bool,
@ -112,9 +106,13 @@ impl Default for DotState {
}
impl DotState {
pub fn is_pivot(&self) -> bool {
pub fn is_pivot_type(&self) -> bool {
self.dot == DotType::Pivot || !self.enabled
}
pub fn is_pivot(&self) -> bool {
self.dot == DotType::Pivot && self.enabled
}
}
impl fmt::Display for DotType {
@ -312,7 +310,7 @@ impl LayoutHolder for SelectTool {
// Pivot
widgets.push(Separator::new(SeparatorType::Unrelated).widget_holder());
widgets.push(self.pivot_reference_point_widget(self.tool_data.selected_layers_count == 0 || !self.tool_data.dot_state.dot.is_pivot()));
widgets.push(self.pivot_reference_point_widget(self.tool_data.selected_layers_count == 0 || !self.tool_data.dot_state.is_pivot()));
// Align
let disabled = self.tool_data.selected_layers_count < 2;
@ -861,7 +859,7 @@ impl Fsm for SelectToolFsmState {
});
let mut active_origin = None;
if overlay_context.visibility_settings.origin() && !tool_data.dot_state.is_pivot() {
if overlay_context.visibility_settings.origin() && !tool_data.dot_state.is_pivot_type() {
for layer in document.network_interface.selected_nodes().selected_visible_and_unlocked_layers(&document.network_interface) {
let origin = graph_modification_utils::get_viewport_origin(layer, &document.network_interface);
if Some(layer) == tool_data.active_layer {
@ -875,7 +873,7 @@ impl Fsm for SelectToolFsmState {
overlay_context.dowel_pin(origin, Some(COLOR_OVERLAY_ORANGE));
}
let draw_pivot = tool_data.dot_state.dot.is_pivot() && overlay_context.visibility_settings.pivot();
let draw_pivot = tool_data.dot_state.is_pivot() && overlay_context.visibility_settings.pivot();
tool_data.pivot.update(document, &mut overlay_context, Some((angle,)), draw_pivot);
// Update compass rose