GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 05:22:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #12898 - Wrong tooltip on macos

Browse Source 
+ Fixed tooltips for layers double slider
This commit is contained in:
YuSanka 2024-06-27 11:06:08 +02:00 committed by Lukas Matena
parent 925f92c4a5
commit d1d9a82cce
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/DoubleSliderForLayers.cpp
View File

@ -20,6 +20,7 @@
#include "I18N.hpp"
#include "ImGuiWrapper.hpp"
#include "libslic3r/libslic3r.h"
#include "slic3r/GUI/GUI.hpp" // GUI::shortkey_ctrl_prefix()
#include "slic3r/GUI/ImGuiDoubleSlider.hpp"
#include "slic3r/GUI/ImGuiPureWrap.hpp"
#include "slic3r/GUI/RulerForDoubleSlider.hpp"
@ -1145,7 +1146,8 @@ std::string DSForLayers::get_tooltip(int tick/*=-1*/)
_u8L("Add color change - Left click") ) + " " +
_u8L("or press \"+\" key") + "\n" + (
is_osx ?
_u8L("Add another code - Ctrl + Left click") :
// TRN %1% is shortkey Ctrl prefix in respect to the OS
format(_u8L("Add another code - %1% Left click"), Slic3r::GUI::shortkey_ctrl_prefix()) :
_u8L("Add another code - Right click") );
}
@ -1210,7 +1212,8 @@ std::string DSForLayers::get_tooltip(int tick/*=-1*/)
if (m_focus == fiActionIcon)
tooltip += "\n\n" + _u8L("Delete tick mark - Left click or press \"-\" key") + "\n" + (
is_osx ?
_u8L("Edit tick mark - Ctrl + Left click") :
// TRN %1% is shortkey Ctrl prefix in respect to the OS
format(_u8L("Edit tick mark - %1% Left click"), Slic3r::GUI::shortkey_ctrl_prefix()) :
_u8L("Edit tick mark - Right click") );
}

2
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View File

@ -324,7 +324,7 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
auto clp_dist = float(m_c->object_clipper()->get_position());
ImGui::SameLine(sliders_left_width);
ImGui::PushItemWidth(window_width - sliders_left_width - slider_icon_width);
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, _L("Ctrl + Mouse wheel")))
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, from_u8(GUI::shortkey_ctrl_prefix()) + _L("Mouse wheel")))
m_c->object_clipper()->set_position_by_ratio(clp_dist, true);
ImGui::Separator();

2
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View File

@ -477,7 +477,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
auto clp_dist = float(m_c->object_clipper()->get_position());
ImGui::SameLine(sliders_left_width);
ImGui::PushItemWidth(window_width - sliders_left_width - slider_icon_width);
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, _L("Ctrl + Mouse wheel")))
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, from_u8(GUI::shortkey_ctrl_prefix()) + _L("Mouse wheel")))
m_c->object_clipper()->set_position_by_ratio(clp_dist, true);
ImGui::Separator();

2
src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
View File

@ -168,7 +168,7 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
auto clp_dist = float(m_c->object_clipper()->get_position());
ImGui::SameLine(sliders_left_width);
ImGui::PushItemWidth(window_width - sliders_left_width - slider_icon_width);
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, _L("Ctrl + Mouse wheel")))
if (m_imgui->slider_float("##clp_dist", &clp_dist, 0.f, 1.f, "%.2f", 1.0f, true, from_u8(GUI::shortkey_ctrl_prefix()) + _L("Mouse wheel")))
m_c->object_clipper()->set_position_by_ratio(clp_dist, true);
ImGui::Separator();