mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-25 22:25:21 +00:00
Compare commits
1 Commits
nightly-bu
...
chore/aabb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af0a02ffa9 |
@@ -32,7 +32,8 @@ namespace AABBTreeLines {
|
|||||||
{
|
{
|
||||||
Vec<LineType::Dim, typename LineType::Scalar> nearest_point;
|
Vec<LineType::Dim, typename LineType::Scalar> nearest_point;
|
||||||
const LineType& line = lines[primitive_index];
|
const LineType& line = lines[primitive_index];
|
||||||
squared_distance = line_alg::distance_to_squared(line, origin.template cast<typename LineType::Scalar>(), &nearest_point);
|
const Vec<LineType::Dim, typename LineType::Scalar> origin_cast = origin.template cast<typename LineType::Scalar>();
|
||||||
|
squared_distance = line_alg::distance_to_squared(line, origin_cast, &nearest_point);
|
||||||
return nearest_point.template cast<ScalarType>();
|
return nearest_point.template cast<ScalarType>();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -338,21 +338,7 @@ void FilamentGroupPopup::OnRadioBtn(int idx)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FilamentGroupPopup::OnTimer(wxTimerEvent &event)
|
void FilamentGroupPopup::OnTimer(wxTimerEvent &event) { Dismiss(); }
|
||||||
{
|
|
||||||
#if __APPLE__
|
|
||||||
// On macOS, when moving cursor from slice button to this popup window,
|
|
||||||
// the popup window entering event is triggered first, then the slice button
|
|
||||||
// leaving event got triggered. So the timer is stopped first, then started
|
|
||||||
// again, causing the popup being dismissed immediately.
|
|
||||||
// To fix this, we check if cursor is still inside the popup window before
|
|
||||||
// dismissing.
|
|
||||||
wxPoint pos = this->ScreenToClient(wxGetMousePosition());
|
|
||||||
if (this->GetClientRect().Contains(pos)) return;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Dismiss();
|
|
||||||
}
|
|
||||||
|
|
||||||
void FilamentGroupPopup::Dismiss() {
|
void FilamentGroupPopup::Dismiss() {
|
||||||
m_active = false;
|
m_active = false;
|
||||||
|
|||||||
@@ -2448,7 +2448,7 @@ void TabPrint::build()
|
|||||||
optgroup->append_single_option_line("sparse_infill_density", "strength_settings_infill#sparse-infill-density");
|
optgroup->append_single_option_line("sparse_infill_density", "strength_settings_infill#sparse-infill-density");
|
||||||
optgroup->append_single_option_line("fill_multiline", "strength_settings_infill#fill-multiline");
|
optgroup->append_single_option_line("fill_multiline", "strength_settings_infill#fill-multiline");
|
||||||
optgroup->append_single_option_line("sparse_infill_pattern", "strength_settings_infill#sparse-infill-pattern");
|
optgroup->append_single_option_line("sparse_infill_pattern", "strength_settings_infill#sparse-infill-pattern");
|
||||||
optgroup->append_single_option_line("gyroid_optimized", "strength_settings_patterns#gyroid-optimized");
|
optgroup->append_single_option_line("gyroid_optimized", "strength_settings_patterns#gyroid_optimized");
|
||||||
optgroup->append_single_option_line("infill_direction", "strength_settings_infill#direction");
|
optgroup->append_single_option_line("infill_direction", "strength_settings_infill#direction");
|
||||||
optgroup->append_single_option_line("sparse_infill_rotate_template", "strength_settings_infill_rotation_template_metalanguage");
|
optgroup->append_single_option_line("sparse_infill_rotate_template", "strength_settings_infill_rotation_template_metalanguage");
|
||||||
optgroup->append_single_option_line("skin_infill_density", "strength_settings_patterns#locked-zag");
|
optgroup->append_single_option_line("skin_infill_density", "strength_settings_patterns#locked-zag");
|
||||||
|
|||||||
Reference in New Issue
Block a user