Texture displacement: typed values on every panel slider

Every slider in the texture displacement panel now takes an exact number, either by Ctrl+clicking the track or through a small edit icon at its right end. Both routes end in ImGui's own temp-input mode: the icon only asks ImGui to focus the slider, which is what turns it into an input box, so the parsing, the clamping and the Enter/click-away behaviour stay ImGui's rather than becoming a second implementation. The mechanism lives in one helper, typed_row(), with a float and an int form over it. float_row() and int_row() are thin wrappers on those, and the six sliders that previously built their widget inline (brush size, smart fill angle, edge fade amount, remesh sharp angle, refine resolution and the uniform triangle budget) now go through the same path. Each slider carries a tooltip with its description and its range. The range is derived from the bounds and the format string the slider is already given, so no row states them twice and the tooltip cannot drift from the track. The tooltip allows hovering while disabled, since several rows are drawn inside disabled_begin(), where a greyed slider is exactly when the explanation is wanted. The panel's "?" popup gains an entry for each of the two ways in, appended to every tool's shortcut list and shown on their own when no painting tool is selected, where that popup was previously empty.
2026-10-12 10:21:17 +00:00 · 2026-10-12 07:57:07 +02:00
18 changed files with 308 additions and 477 deletions
@@ -1,3 +0,0 @@
-<svg width="28" height="27" viewBox="0 0 28 27" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path transform="matrix(0.9 0 0 0.9 1.4 1.35)" d="M11.9888 2.01601C12.8984 0.494662 15.1024 0.494662 16.012 2.01601L18.8677 6.79237C19.1958 7.34113 19.7339 7.73201 20.3572 7.87447L25.7821 9.11446C27.5101 9.50943 28.1913 11.6056 27.0254 12.9408L23.3652 17.1327C22.9449 17.6143 22.7394 18.2469 22.7964 18.8836L23.2936 24.4263C23.4519 26.1918 21.6687 27.4873 20.0386 26.7911L14.9209 24.6056C14.3329 24.3545 13.6679 24.3545 13.0799 24.6056L7.96209 26.7911C6.33196 27.4873 4.54887 26.1918 4.70722 24.4263L5.20434 18.8836C5.26145 18.2469 5.05595 17.6143 4.63544 17.1327L0.97533 12.9408C-0.19048 11.6056 0.490599 9.50943 2.21859 9.11446L7.64364 7.87447C8.2669 7.73201 8.80494 7.34113 9.13302 6.79237L11.9888 2.01601Z" stroke="#949494" stroke-width="2.4" stroke-linejoin="round"/>
-</svg>
@@ -1,6 +1,6 @@
 {
 	"name": "Qidi",
-	"version": "02.04.00.17",
+	"version": "02.04.00.16",
 	"force_update": "0",
 	"description": "Qidi configurations",
 	"machine_model_list": [
@@ -83,7 +83,7 @@
 	"extruder_clearance_height_to_lid": "120",
 	"layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nLOG_Z\nG92 E0\n",
 	"machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}",
-	"machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\n",
+	"machine_start_gcode": "PRINT_START BED=[hot_plate_temp_initial_layer] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature]\nM83\nM140 S[hot_plate_temp_initial_layer]\nM104 S[nozzle_temperature_initial_layer]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\n",
 	"thumbnails_format": "PNG",
 	"default_filament_profile": [
 		"Generic PLA @Qidi Q1 Pro 0.4 nozzle"
@@ -100,7 +100,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Qidi"
 	],
-	"machine_start_gcode": "G28\nM140 S[bed_temperature_initial_layer_single]\nM190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nG92 E-19\nG0 Y5 Z0.3 F3600\nG1 X5 E0 F2400\n",
+	"machine_start_gcode": "G28\nM140 S[hot_plate_temp_initial_layer]\nM190 S[hot_plate_temp_initial_layer]\nM109 S[nozzle_temperature_initial_layer]\nG92 E-19\nG0 Y5 Z0.3 F3600\nG1 X5 E0 F2400\n",
 	"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n",
 	"scan_first_layer": "0"
 }
@@ -24,7 +24,7 @@
 		"210x210/COLPIC",
 		"110x110/PNG"
 	],
-	"machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[bed_temperature_initial_layer_single]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM141 S{overall_chamber_temperature}\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n",
+	"machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[hot_plate_temp_initial_layer]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM141 S{overall_chamber_temperature}\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n",
 	"machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}",
 	"scan_first_layer": "0"
 }
@@ -1729,8 +1729,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            //plate->pattern_file = it->second->pattern_file;
            plate->no_light_thumbnail_file = it->second->no_light_thumbnail_file;
            plate->top_file = it->second->top_file;
-            plate->pick_file = it->second->pick_file;
-            plate->pattern_bbox_file = it->second->pattern_bbox_file;
+            plate->pick_file = it->second->pick_file.empty();
+            plate->pattern_bbox_file = it->second->pattern_bbox_file.empty();
            plate->config = it->second->config;

            if (!plate->thumbnail_file.empty())
@@ -3295,7 +3295,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
    m_is_role_based_fan_on.fill(false);
    m_role_based_fan_marker_layer.fill(-1);

-    m_fan_mover.reset();
+    m_fan_mover.release();
    m_ordering_cache.clear();

    // Belt printer: initialize belt-specific writer via virtual hook.
@@ -16,7 +16,6 @@
 #include <wx/checklst.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/Widgets/Button.hpp"
-#include "slic3r/GUI/Widgets/DropDown.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include <utility>
 #include "slic3r/GUI/wxExtensions.hpp"
@@ -173,26 +172,7 @@ void AMSMaterialsSetting::create()

    Bind(wxEVT_PAINT, &AMSMaterialsSetting::paintEvent, this);
    Bind(EVT_SELECTED_COLOR, &AMSMaterialsSetting::on_picker_color, this);
-    m_comboBox_filament->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(AMSMaterialsSetting::on_select_filament), NULL, this);
-    m_comboBox_filament->Bind(EVT_DROPDOWN_ITEM_ACTION, &AMSMaterialsSetting::on_toggle_favorite_filament, this);
-
-    // Favorites toggled in the open list are regrouped just before it opens again, so rows never move
-    // under the cursor. These handlers run ahead of ComboBox's own, which then measure and show the
-    // rebuilt rows; wxEVT_COMBOBOX_DROPDOWN would be too late, as ComboBox sends it after showing the list.
-    auto regroup_favorites = [this]() {
-        if (!m_favorites_regroup || m_comboBox_filament->is_drop_down())
-            return;
-        const FilamentInfos* info        = selected_filament_info();
-        const std::string    filament_id = info ? info->filament_id : std::string();
-        rebuild_filament_dropdown_items(filament_id);
-    };
-    m_comboBox_filament->Bind(wxEVT_LEFT_DOWN, [regroup_favorites](wxMouseEvent& e) { regroup_favorites(); e.Skip(); });
-    m_comboBox_filament->Bind(wxEVT_LEFT_DCLICK, [regroup_favorites](wxMouseEvent& e) { regroup_favorites(); e.Skip(); });
-    m_comboBox_filament->Bind(wxEVT_KEY_DOWN, [regroup_favorites](wxKeyEvent& e) {
-        if (e.GetKeyCode() == WXK_RETURN || e.GetKeyCode() == WXK_SPACE) // the keys that open the list
-            regroup_favorites();
-        e.Skip();
-    });
+     m_comboBox_filament->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(AMSMaterialsSetting::on_select_filament), NULL, this);

    m_comboBox_cali_result->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(AMSMaterialsSetting::on_select_cali_result), NULL, this);
 }
@@ -211,9 +191,11 @@ void AMSMaterialsSetting::create_panel_normal(wxWindow* parent)

    m_sizer_filament->Add(0, 0, 0, wxEXPAND, 0);

+#ifdef __APPLE__
+    m_comboBox_filament = new wxComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, AMS_MATERIALS_SETTING_COMBOX_WIDTH, 0, nullptr, wxCB_READONLY);
+#else
    m_comboBox_filament = new ::ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, AMS_MATERIALS_SETTING_COMBOX_WIDTH, 0, nullptr, wxCB_READONLY);
-    m_star_filled = ScalableBitmap(this, "score_star_light", 16);
-    m_star_empty  = ScalableBitmap(this, "score_star_outline", 16);
+#endif

    m_sizer_filament->Add(m_comboBox_filament, 1, wxALIGN_CENTER, 0);

@@ -438,7 +420,6 @@ void AMSMaterialsSetting::paintEvent(wxPaintEvent &evt)
 AMSMaterialsSetting::~AMSMaterialsSetting()
 {
    m_comboBox_filament->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(AMSMaterialsSetting::on_select_filament), NULL, this);
-    m_comboBox_filament->Unbind(EVT_DROPDOWN_ITEM_ACTION, &AMSMaterialsSetting::on_toggle_favorite_filament, this);
    m_comboBox_cali_result->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(AMSMaterialsSetting::on_select_cali_result), NULL, this);
 }

@@ -550,9 +531,10 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
    std::string   selected_ams_id;
    PresetBundle *preset_bundle = wxGetApp().preset_bundle;
    if (preset_bundle) {
-        const FilamentInfos* selected_info = selected_filament_info();
        for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
-            if (selected_info && it->filament_id.compare(selected_info->filament_id) == 0) {
+            auto        filament_item = map_filament_items[m_comboBox_filament->GetValue().ToStdString()];
+            std::string filament_id   = filament_item.filament_id;
+            if (it->filament_id.compare(filament_id) == 0) {
                selected_ams_id = it->filament_id;
                break;
            }
@@ -700,13 +682,12 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
    ams_setting_id = "";

    // the combobox item
-    const FilamentInfos* selected_info = selected_filament_info();
-    const std::string    filament_id   = selected_info ? selected_info->filament_id : std::string();
+    auto filament_item = map_filament_items[m_comboBox_filament->GetValue().ToStdString()];

    // check filament info (rack-gated per-nozzle blacklist evaluation)
    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
    const auto& fila_check_res = sCheckFilamentInfo(preset_bundle, obj, ams_id, slot_id,
-                                                    filament_id, ams_filament_id, ams_setting_id);
+                                                    filament_item.filament_id, ams_filament_id, ams_setting_id);

    if (const auto& prohibit_items = fila_check_res.get_items_by_action("prohibition"); !prohibit_items.empty()) {
        wxString info_msg;
@@ -1005,133 +986,6 @@ static void _collect_filament_info(const wxString& shown_name,
    query_filament_types[shown_name] = filament.config.get_filament_type();
 }

-static const char* AMS_FAVORITE_FILAMENT_IDS_KEY = "ams_favorite_filament_ids";
-
-const AMSMaterialsSetting::FilamentInfos* AMSMaterialsSetting::selected_filament_info() const
-{
-    const int selection = m_comboBox_filament->GetSelection();
-    if (selection < 0 || selection >= int(m_filament_list_items.size()) || !m_filament_list_items[selection].is_filament)
-        return nullptr;
-    return &m_filament_list_items[selection].filament;
-}
-
-std::set<std::string> AMSMaterialsSetting::load_favorite_filament_ids() const
-{
-    std::set<std::string> favorite_ids;
-    std::vector<std::string> values;
-    const std::string serialized = wxGetApp().app_config->get(AMS_FAVORITE_FILAMENT_IDS_KEY);
-    if (!serialized.empty() && Slic3r::unescape_strings_cstyle(serialized, values)) {
-        favorite_ids.insert(values.begin(), values.end());
-    }
-    return favorite_ids;
-}
-
-void AMSMaterialsSetting::save_favorite_filament_ids(const std::set<std::string>& favorite_ids)
-{
-    std::vector<std::string> values(favorite_ids.begin(), favorite_ids.end());
-    wxGetApp().app_config->set(AMS_FAVORITE_FILAMENT_IDS_KEY, Slic3r::escape_strings_cstyle(values));
-    wxGetApp().app_config->save();
-}
-
-void AMSMaterialsSetting::rebuild_filament_dropdown_items(const std::string& selected_filament_id)
-{
-    std::vector<DropDown::Item> items;
-    m_filament_list_items.clear();
-
-    auto append_header = [&items, this](const wxString& label) {
-        DropDown::Item item;
-        item.text = label;
-        item.style = DD_ITEM_STYLE_SPLIT_ITEM | DD_ITEM_STYLE_DISABLED;
-        items.push_back(item);
-        m_filament_list_items.push_back(FilamentListItem{});
-    };
-
-    auto append_filament = [&items, this](const wxString& name) {
-        auto info_it = map_filament_items.find(name);
-        if (info_it == map_filament_items.end())
-            return;
-
-        DropDown::Item item;
-        item.text = name;
-        items.push_back(item);
-        m_filament_list_items.push_back(FilamentListItem{info_it->second, true});
-    };
-
-    // Favorites are listed again at the top under their own header. Without any, the list is the
-    // plain filament list.
-    const std::set<std::string> favorite_ids = load_favorite_filament_ids();
-    std::vector<wxString>       favorites;
-    for (const wxString& name : m_sorted_filament_items) {
-        auto info_it = map_filament_items.find(name);
-        if (info_it != map_filament_items.end() && favorite_ids.count(info_it->second.filament_id) > 0)
-            favorites.push_back(name);
-    }
-    if (!favorites.empty()) {
-        append_header(_L("Favorite filaments"));
-        for (const wxString& name : favorites)
-            append_filament(name);
-        append_header(_L("All filaments"));
-    }
-    for (const wxString& name : m_sorted_filament_items)
-        append_filament(name);
-
-    int selection_idx = -1;
-    if (!selected_filament_id.empty()) {
-        for (int i = 0; i < int(m_filament_list_items.size()); ++i) {
-            if (m_filament_list_items[i].is_filament && m_filament_list_items[i].filament.filament_id == selected_filament_id) {
-                selection_idx = i;
-                break;
-            }
-        }
-    }
-
-    // Clear() first: SetItems() keeps the old selection, and SetSelection() ignores an index equal to it,
-    // which would leave the previous filament's name on the combo.
-    m_comboBox_filament->Clear();
-    m_comboBox_filament->SetItems(items);
-    update_favorite_stars();
-    m_comboBox_filament->SetSelection(selection_idx);
-    m_favorites_regroup = false;
-}
-
-void AMSMaterialsSetting::update_favorite_stars()
-{
-    const std::set<std::string> favorite_ids = load_favorite_filament_ids();
-    for (size_t i = 0; i < m_filament_list_items.size(); ++i) {
-        const FilamentListItem& row = m_filament_list_items[i];
-        if (row.is_filament) {
-            const bool favorite = favorite_ids.count(row.filament.filament_id) > 0;
-            m_comboBox_filament->SetItemActionBitmap(i, favorite ? m_star_filled.bmp() : m_star_empty.bmp());
-        }
-    }
-}
-
-void AMSMaterialsSetting::toggle_favorite_filament(const std::string& filament_id)
-{
-    if (filament_id.empty())
-        return;
-
-    std::set<std::string> favorite_ids = load_favorite_filament_ids();
-    auto iter = favorite_ids.find(filament_id);
-    if (iter == favorite_ids.end())
-        favorite_ids.insert(filament_id);
-    else
-        favorite_ids.erase(iter);
-
-    save_favorite_filament_ids(favorite_ids);
-}
-
-void AMSMaterialsSetting::on_toggle_favorite_filament(wxCommandEvent& evt)
-{
-    const int index = evt.GetInt();
-    if (index < 0 || index >= int(m_filament_list_items.size()) || !m_filament_list_items[index].is_filament)
-        return;
-
-    toggle_favorite_filament(m_filament_list_items[index].filament.filament_id);
-    update_favorite_stars();
-    m_favorites_regroup = true;
-}
-
 void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max, wxString k, wxString n)
 {
    if (!obj) return;
@@ -1145,12 +999,13 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
    m_input_k_val->GetTextCtrl()->SetValue(k);
    m_input_n_val->GetTextCtrl()->SetValue(n);

+    wxArrayString filament_items;
    wxString bambu_filament_name;
+    wxString hint_filament_name; // the hint type to be selected
    std::unordered_map<wxString, wxString> query_filament_vendors;// some information for sort
    std::unordered_map<wxString, wxString> query_filament_types;  //

    std::set<std::string> filament_id_set;
-    m_sorted_filament_items.clear();
    // The alias keyed map has to start empty: it is a member, so a stale alias left by an earlier
    // popup (a different printer, a different nozzle) would resolve to that printer's filament_id.
    map_filament_items.clear();
@@ -1180,7 +1035,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
            if (alias.empty())
                continue;

-            m_sorted_filament_items.push_back(alias);
+            filament_items.push_back(alias);
            _collect_filament_info(alias, *filament_it, query_filament_vendors, query_filament_types);

            FilamentInfos filament_infos;
@@ -1189,6 +1044,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
            map_filament_items[alias]  = filament_infos;

            if (filament_it->filament_id == ams_filament_id) {
+                hint_filament_name = from_u8(alias);
                bambu_filament_name = from_u8(alias);


@@ -1359,11 +1215,24 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
            return name_compare != 0 ? name_compare < 0 : left < right;
        };

-        std::sort(m_sorted_filament_items.begin(), m_sorted_filament_items.end(), _filament_sorter);
+        std::sort(filament_items.begin(), filament_items.end(), _filament_sorter);
    }

-    rebuild_filament_dropdown_items(ams_filament_id);
-    int selection_idx = m_comboBox_filament->GetSelection();
+    // traverse the hint selection idx
+    int selection_idx = -1;
+    {
+        for(int i = 0; i < filament_items.size(); i++)
+        {
+            if (hint_filament_name == filament_items[i])
+            {
+                selection_idx = i;
+                break;
+            }
+        }
+    }
+
+    m_comboBox_filament->Set(filament_items);
+    m_comboBox_filament->SetSelection(selection_idx);
    post_select_event(selection_idx);

    if (selection_idx < 0) {
@@ -1420,7 +1289,6 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
    int* from_printer = static_cast<int*>(m_comboBox_filament->GetClientData());

    m_filament_type = "";
-    const FilamentInfos* selected_info = selected_filament_info();
    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
    if (preset_bundle) {
        std::ostringstream stream;
@@ -1441,8 +1309,9 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
        std::string nozzle_diameter_str = stream.str();
        // Resolve the selection against the same list Popup() built the dropdown from, so the two
        // halves of the dialog cannot disagree about which filaments this machine can use.
-        if (selected_info) {
-            const std::string& filament_id = selected_info->filament_id;
+        const std::string selected = m_comboBox_filament->GetValue().ToStdString();
+        if (!selected.empty()) {
+            const std::string filament_id = map_filament_items[selected].filament_id;
            for (Preset *it : preset_bundle->get_filament_presets_for_machine(
                     DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) {
                if (it->filament_id != filament_id)
@@ -1495,7 +1364,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
    //reset cali
    int cali_select_idx = -1;

-    if ( !this->obj || m_filament_selection < 0 || !selected_info) {
+    if ( !this->obj || m_filament_selection < 0) {
        m_input_k_val->Enable(false);
        m_input_n_val->Enable(false);
        m_button_confirm->Disable(); // ORCA No need to change style
@@ -1514,9 +1383,21 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
    ams_filament_id = "";
    ams_setting_id = "";

-    if (selected_info) {
-        ams_filament_id = selected_info->filament_id;
-        ams_setting_id  = selected_info->setting_id;
+    if (preset_bundle) {
+        for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
+            auto itor = map_filament_items.find(m_comboBox_filament->GetValue().ToStdString());
+            if ( itor != map_filament_items.end()) {
+                ams_filament_id = itor->second.filament_id;
+                ams_setting_id  = itor->second.setting_id;
+                break;
+            }
+
+            if (it->alias.compare(m_comboBox_filament->GetValue().ToStdString()) == 0) {
+                ams_filament_id = it->filament_id;
+                ams_setting_id = it->setting_id;
+                break;
+            }
+        }
    }

    wxArrayString items;
@@ -1648,11 +1529,6 @@ void AMSMaterialsSetting::on_dpi_changed(const wxRect &suggested_rect)
    m_button_reset->Rescale(); // ORCA
    m_button_confirm->Rescale(); // ORCA
    m_button_close->Rescale(); // ORCA
-    // An open list would keep the measurements of the old stars, so close it before replacing them.
-    m_comboBox_filament->CloseDropdown();
-    m_star_filled.msw_rescale();
-    m_star_empty.msw_rescale();
-    update_favorite_stars();
    this->Refresh();
 }

@@ -31,7 +31,6 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/panel.h>
 #include <map>
-#include <set>

 #define AMS_MATERIALS_SETTING_DEF_COLOUR wxColour(255, 255, 255)
 #define AMS_MATERIALS_SETTING_GREY900 wxColour(38, 46, 48)
@@ -157,7 +156,6 @@ protected:
    void create_panel_kn(wxWindow* parent);
    void on_dpi_changed(const wxRect &suggested_rect) override;
    void on_select_filament(wxCommandEvent& evt);
-    void on_toggle_favorite_filament(wxCommandEvent& evt);
    void on_select_cali_result(wxCommandEvent &evt);
    void on_select_ok(wxCommandEvent &event);
    void on_select_reset(wxCommandEvent &event);
@@ -165,11 +163,6 @@ protected:
    void on_clr_picker(wxMouseEvent &event);
    bool is_virtual_tray();
    void update_widgets();
-    void rebuild_filament_dropdown_items(const std::string& selected_filament_id);
-    void update_favorite_stars();
-    std::set<std::string> load_favorite_filament_ids() const;
-    void save_favorite_filament_ids(const std::set<std::string>& favorite_ids);
-    void toggle_favorite_filament(const std::string& filament_id);

    void update_filament_editing(bool is_printing);
    // Orca: the variant index of the filament's per-variant options on the nozzle this tray feeds
@@ -209,7 +202,12 @@ protected:

    int m_pa_cali_select_id = 0;

+// Orca: native wxComboBox on macOS (the custom ComboBox mis-renders the filament dropdown there)
+#ifdef __APPLE__
+    wxComboBox *m_comboBox_filament;
+#else
    ComboBox *m_comboBox_filament;
+#endif
    ComboBox * m_comboBox_cali_result;
    TextInput*       m_readonly_filament;

@@ -217,20 +215,7 @@ protected:
        std::string filament_id;
        std::string setting_id;
    };
-    struct FilamentListItem {
-        FilamentInfos filament;
-        bool          is_filament{false};
-    };
-    const FilamentInfos* selected_filament_info() const;
-
-    // Keyed by the same wxString the dropdown shows, so a row's name never has to be converted back.
-    std::map<wxString, FilamentInfos>    map_filament_items;
-    std::vector<wxString>                m_sorted_filament_items;
-    std::vector<FilamentListItem>        m_filament_list_items;
-    ScalableBitmap                       m_star_filled;
-    ScalableBitmap                       m_star_empty;
-    // Favorites changed while the list was open; their rows are regrouped before it opens again.
-    bool                                 m_favorites_regroup{false};
+    std::map<std::string, FilamentInfos> map_filament_items;
 };

 wxDECLARE_EVENT(EVT_SELECTED_COLOR, wxCommandEvent);
@@ -3232,16 +3232,9 @@ bool GUI_App::on_init_inner()
 #ifdef _MSW_DARK_MODE

 #ifndef __WINDOWS__
-    // The label colours and the dark mode flag were set above from the saved mode. When the system theme
-    // differs from it, refresh them, or dialogs that map their colours stay in the old mode for this session.
-    const bool saved_dark_mode = dark_mode();
    wxSystemAppearance app = wxSystemSettings::GetAppearance();
    GUI::wxGetApp().app_config->set("dark_color_mode", app.IsDark() ? "1" : "0");
    GUI::wxGetApp().app_config->save();
-    if (dark_mode() != saved_dark_mode) {
-        init_label_colours();
-        Update_dark_mode_flag();
-    }
 #endif // __APPLE__


@@ -1617,7 +1617,7 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me
            int obj_idx, vol_idx;
            get_selected_item_indexes(obj_idx, vol_idx, item);
            if (obj_idx != -1) {
-                Plater::TakeSnapshot snapshot(plater, _u8L("Shift objects to bed"));
+                Plater::TakeSnapshot(plater, _u8L("Shift objects to bed"));
                (*m_objects)[obj_idx]->ensure_on_bed();
                cnv->reload_scene(true, true);
                update_info_items(obj_idx);
@@ -2779,13 +2779,12 @@ void ObjectList::del_info_item(const int obj_idx, InfoItemType type)
    GLCanvas3D* cnv = plater->canvas3D();

    switch (type) {
-    case InfoItemType::CustomSupports: {
+    case InfoItemType::CustomSupports:
        cnv->get_gizmos_manager().reset_all_states();
-        Plater::TakeSnapshot snapshot(plater, "Remove support painting");
+        Plater::TakeSnapshot(plater, "Remove support painting");
        for (ModelVolume* mv : (*m_objects)[obj_idx]->volumes)
            mv->supported_facets.reset();
        break;
-    }

    // BBS: remove CustomSeam

@@ -2796,21 +2795,19 @@ void ObjectList::del_info_item(const int obj_idx, InfoItemType type)
        }
        break;

-    case InfoItemType::MmSegmentation: {
+    case InfoItemType::MmSegmentation:
        cnv->get_gizmos_manager().reset_all_states();
-        Plater::TakeSnapshot snapshot(plater, "Remove color painting");
+        Plater::TakeSnapshot(plater, "Remove color painting");
        for (ModelVolume* mv : (*m_objects)[obj_idx]->volumes)
            mv->mmu_segmentation_facets.reset();
        break;
-    }

-    case InfoItemType::FuzzySkin: {
+    case InfoItemType::FuzzySkin:
        cnv->get_gizmos_manager().reset_all_states();
-        Plater::TakeSnapshot snapshot(plater, _u8L("Remove paint-on fuzzy skin"));
+        Plater::TakeSnapshot(plater, _u8L("Remove paint-on fuzzy skin"));
        for (ModelVolume* mv : (*m_objects)[obj_idx]->volumes)
            mv->fuzzy_skin_facets.reset();
        break;
-    }

    // BBS: remove Sinking
    case InfoItemType::Undef : assert(false); break;
@@ -6721,7 +6718,7 @@ void ObjectList::OnEditingStarted(wxDataViewEvent &event)
    else if (col == colSinking) {
        Plater *    plater = wxGetApp().plater();
        GLCanvas3D *cnv    = plater->canvas3D();
-        Plater::TakeSnapshot snapshot(plater, _u8L("Shift objects to bed"));
+        Plater::TakeSnapshot(plater, _u8L("Shift objects to bed"));
        int obj_idx, vol_idx;
        get_selected_item_indexes(obj_idx, vol_idx, item);
        (*m_objects)[obj_idx]->ensure_on_bed();
@@ -494,7 +494,17 @@ bool GLGizmoTextureDisplacement::on_init()
        {ctrl + _L("Mouse wheel"), m_desc["gap_area"]},
        toggle_wireframe_shortcut
    };
- 
+
+    // Both ways into the same input box on any slider in the panel: ImGui turns a slider into one when
+    // it is Ctrl+clicked or when it is given the keyboard focus, which is what the edit icon asks for.
+    m_desc["type_value"] = _L("Type an exact value into a slider");
+    m_shortcuts_sliders  = {
+        {ctrl + _L("Left mouse button"), m_desc["type_value"]},
+        {_L("Edit icon at a slider's right end"), m_desc["type_value"]},
+    };
+    for (std::vector<std::pair<wxString, wxString>> *list : {&m_shortcuts_brush, &m_shortcuts_bucket_fill, &m_shortcuts_gap_fill})
+        list->insert(list->end(), m_shortcuts_sliders.begin(), m_shortcuts_sliders.end());
+
    return true;
 }

@@ -3680,6 +3690,8 @@ void GLGizmoTextureDisplacement::ensure_panel_icons()
        "texture_displacement_adjust.svg", "canvas_drag.svg", "texture_displacement_move_up.svg",
        "texture_displacement_move_down.svg", "texture_displacement_drag.svg",
        "texture_displacement_select_all.svg", "texture_displacement_erase_all.svg",
+        // The "type a value instead" icon at the right end of every slider.
+        "edit.svg",
    };
    std::vector<std::string> paths;
    paths.reserve(names.size());
@@ -5919,8 +5931,8 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        }
        return s + "...";
    };
-    // Label column + a slider filling the rest of the row, value printed inside the track. Ctrl+click on
-    // any of these types a value in. `right_inset` keeps a layer card's inner padding.
+    // Label column + a slider filling the rest of the row, value printed inside the track.
+    // `right_inset` keeps a layer card's inner padding.
    const auto slider_label = [&](const wxString &label) {
        const float x0 = ImGui::GetCursorPosX();
        ImGui::AlignTextToFramePadding();
@@ -5928,17 +5940,107 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        ImGui::SameLine();
        ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + label_w));
    };
+
+    // ---- Typed values on sliders ----
+    // Every slider in the panel goes through typed_slider(), so all of them take a number the same
+    // two ways: Ctrl+click on the track, or the edit icon at the right end for the same box without
+    // the modifier. Both end up in ImGui's own "temp input" mode - the icon only asks ImGui to focus
+    // the slider, which is what turns it into an input box (see SliderScalar) - so the parsing,
+    // the clamping and the Enter/click-away behaviour are ImGui's, not a second implementation.
+
+    // Retires a click whose row is no longer being drawn - the panel changed mode in between - so that
+    // it cannot fire later when that row comes back. Before any row is drawn, so a live one still wins.
+    if (!m_slider_type_request.empty() && ImGui::GetFrameCount() > m_slider_type_request_frame + 1)
+        m_slider_type_request.clear();
+
+    // Exactly as tall as the slider it sits beside, so it lines up with the track without the row
+    // having to be re-centred around it; icon_button() pads the glyph itself down to about 0.7 of this.
+    const float edit_icon_w = frame_h;
+    // What the slider's own width has to give up for the icon beside it.
+    const float edit_icon_room = edit_icon_w + gap_s;
+
+    // One end of a range, through the slider's own format, so the bounds in the tooltip read exactly
+    // like the value in the track. A parenthesised note in the format - "(auto)" - is dropped: it
+    // describes the current state, not the bound.
+    const auto fmt_bound = [](const char *format, auto v) {
+        char buf[64];
+        std::snprintf(buf, sizeof(buf), format, v);
+        std::string out(buf);
+        const size_t paren = out.find('(');
+        if (paren != std::string::npos)
+            out.erase(paren);
+        while (!out.empty() && out.back() == ' ')
+            out.pop_back();
+        return out;
+    };
+    const auto range_text = [](const std::string &lo, const std::string &hi) {
+        return Slic3r::format(_u8L("Range: %1% to %2%"), lo, hi);
+    };
+    const auto edit_icon_tip = [&](const std::string &range) {
+        return _u8L("Type a value instead of dragging. Ctrl+click on the slider does the same.") + "\n\n" + range;
+    };
+
+    // Draws `slider` at `item_w` (SetNextItemWidth's convention: negative measures back from the right
+    // edge, and the caller has already left edit_icon_room in it), then the edit icon. `tip` and the
+    // range go on both. Returns whatever the slider returned.
+    const auto typed_row = [&](const char *id, float item_w, const wxString &tip, const std::string &range,
+                               const std::function<bool()> &slider) -> bool {
+        // Deferred from the click a frame ago: SetKeyboardFocusHere() is a request for the *next*
+        // frame, so it has to be issued before the slider it names, not from the icon beside it.
+        if (m_slider_type_request == id) {
+            ImGui::SetKeyboardFocusHere();
+            m_slider_type_request.clear();
+            m_parent.set_as_dirty(); // the focus only lands on a frame that actually gets drawn
+        }
+        ImGui::SetNextItemWidth(item_w);
+        const bool changed = slider();
+        // AllowWhenDisabled: several of these rows are drawn inside disabled_begin(), and a greyed
+        // slider is exactly when the user needs to be told what it is and why it is not moving.
+        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
+            wxString full = tip;
+            if (!full.IsEmpty())
+                full += "\n\n";
+            m_imgui->tooltip(full + from_u8(range), wrap_w);
+        }
+        // SameLine() puts the cursor back at the slider's own top (ItemSize records the Y the item was
+        // drawn at), so an icon of the same height lands on the track wherever the row placed it.
+        ImGui::SameLine(0.f, gap_s);
+        if (icon_button(int(ImGui::GetID(id)), "edit.svg", edit_icon_w, _L("Edit"), from_u8(edit_icon_tip(range)))) {
+            m_slider_type_request       = id;
+            m_slider_type_request_frame = ImGui::GetFrameCount();
+            m_parent.set_as_dirty(); // the next frame is where the request above is turned into focus
+        }
+        return changed;
+    };
+
+    // The two forms every slider in the panel is one of. They derive the range from the bounds they are
+    // already given, so no row states its bounds or its format twice and the tooltip cannot drift from
+    // the track. `item_w` is as typed_row() takes it.
+    const auto typed_slider = [&](const char *id, float item_w, float *v, float v_min, float v_max, const char *format,
+                                  bool log, const wxString &tip) -> bool {
+        return typed_row(id, item_w, tip, range_text(fmt_bound(format, v_min), fmt_bound(format, v_max)), [&] {
+            return ImGui::SliderFloat(id, v, v_min, v_max, format,
+                                      ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        });
+    };
+    const auto typed_slider_int = [&](const char *id, float item_w, int *v, int v_min, int v_max, const char *format,
+                                      bool log, const wxString &tip) -> bool {
+        return typed_row(id, item_w, tip, range_text(fmt_bound(format, v_min), fmt_bound(format, v_max)), [&] {
+            return ImGui::SliderInt(id, v, v_min, v_max, format,
+                                    ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        });
+    };
+
+    // Label column + the slider filling the rest of the row.
    const auto float_row = [&](const char *id, const wxString &label, float *v, float v_min, float v_max, const char *format,
-                               bool log, float right_inset) -> bool {
+                               bool log, float right_inset, const wxString &tip) -> bool {
        slider_label(label);
-        ImGui::SetNextItemWidth(-std::max(right_inset, 1.f));
-        return ImGui::SliderFloat(id, v, v_min, v_max, format, ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        return typed_slider(id, -(std::max(right_inset, 1.f) + edit_icon_room), v, v_min, v_max, format, log, tip);
    };
    const auto int_row = [&](const char *id, const wxString &label, int *v, int v_min, int v_max, const char *format,
-                             float right_inset) -> bool {
+                             float right_inset, const wxString &tip) -> bool {
        slider_label(label);
-        ImGui::SetNextItemWidth(-std::max(right_inset, 1.f));
-        return ImGui::SliderInt(id, v, v_min, v_max, format, ImGuiSliderFlags_AlwaysClamp);
+        return typed_slider_int(id, -(std::max(right_inset, 1.f) + edit_icon_room), v, v_min, v_max, format, false, tip);
    };
    const auto layer_name = [](const TextureDisplacementLayer &l) {
        return l.name.empty() ? Slic3r::format(_u8L("Layer %1%"), l.slot + 1) : l.name;
@@ -6160,11 +6262,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        const auto  centre_on_row = [&](float h) { ImGui::SetCursorPosY(row_y + std::round((icon_md - h) * 0.5f)); };
        vsep(icon_md);
        if (is_brush_mode) {
-            ImGui::SetNextItemWidth(std::max(1.f, row_end - ImGui::GetCursorPosX() - (3.f * gap_s + 1.f + 2.f * icon_sm)));
            centre_on_row(frame_h);
-            ImGui::SliderFloat("##cursor_radius", &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f mm",
-                               ImGuiSliderFlags_AlwaysClamp);
-            hover_tip(m_desc.at("cursor_size"));
+            typed_slider("##cursor_radius",
+                         std::max(1.f, row_end - ImGui::GetCursorPosX() - (3.f * gap_s + 1.f + 2.f * icon_sm) - edit_icon_room),
+                         &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f mm", false, m_desc.at("cursor_size"));
            vsep(icon_sm);
            const bool is_circle = m_cursor_type == TriangleSelector::CursorType::CIRCLE;
            centre_on_row(icon_sm);
@@ -6177,11 +6278,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            _L("Sphere - paints only within a ball around the point under the cursor")))
                m_cursor_type = TriangleSelector::CursorType::SPHERE;
        } else if (is_area_mode) {
-            ImGui::SetNextItemWidth(std::max(1.f, row_end - ImGui::GetCursorPosX()));
            centre_on_row(frame_h);
-            ImGui::SliderFloat("##smart_fill_angle", &m_smart_fill_angle, SmartFillAngleMin, SmartFillAngleMax, "%.0f°",
-                               ImGuiSliderFlags_AlwaysClamp);
-            hover_tip(_u8L("Angle threshold - the fill stops at edges sharper than this"));
+            typed_slider("##smart_fill_angle", std::max(1.f, row_end - ImGui::GetCursorPosX() - edit_icon_room),
+                         &m_smart_fill_angle, SmartFillAngleMin, SmartFillAngleMax, "%.0f°", false,
+                         _L("Angle threshold - the fill stops at edges sharper than this"));
        } else {
            centre_on_row(frame_h);
            ImGui::AlignTextToFramePadding();
@@ -6451,16 +6551,16 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float

            // The three controls nearly every layer needs; everything else waits behind "More settings".
            // Depth and tile size are logarithmic, so both ends of their wide ranges stay usable.
-            m_preview_params_dirty |= float_row("##depth", _L("Depth"), &layer.depth_mm, 0.01f, 10.f, "%.3f mm", true, card_pad);
-            hover_tip(_u8L("Height of the relief: how far white in the texture lifts the surface, in "
-                           "millimetres. Black does not move it at all, unless Midlevel says otherwise."));
-            m_preview_params_dirty |= float_row("##tile_size", _L("Tile size"), &layer.tiling_scale, 0.2f, 200.f, "%.2f mm", true, card_pad);
-            hover_tip(_u8L("How wide one copy of the texture is on the model. Smaller repeats the pattern "
-                           "more often and makes its detail finer; with Tile off, this is the size of the "
-                           "single copy."));
-            m_preview_params_dirty |= float_row("##rotation", _L("Rotation"), &layer.rotation_deg, 0.f, 360.f, "%.0f°", false, card_pad);
-            hover_tip(_u8L("Turns the texture on the surface, in degrees - for lining a pattern up with an "
-                           "edge of the model."));
+            m_preview_params_dirty |= float_row("##depth", _L("Depth"), &layer.depth_mm, 0.01f, 10.f, "%.3f mm", true, card_pad,
+                                                _L("Height of the relief: how far white in the texture lifts the surface, in "
+                                                   "millimetres. Black does not move it at all, unless Midlevel says otherwise."));
+            m_preview_params_dirty |= float_row("##tile_size", _L("Tile size"), &layer.tiling_scale, 0.2f, 200.f, "%.2f mm", true, card_pad,
+                                                _L("How wide one copy of the texture is on the model. Smaller repeats the pattern "
+                                                   "more often and makes its detail finer; with Tile off, this is the size of the "
+                                                   "single copy."));
+            m_preview_params_dirty |= float_row("##rotation", _L("Rotation"), &layer.rotation_deg, 0.f, 360.f, "%.0f°", false, card_pad,
+                                                _L("Turns the texture on the surface, in degrees - for lining a pattern up with an "
+                                                   "edge of the model."));

            if (m_layer_expanded[size_t(layer.slot)]) {
                {
@@ -6475,22 +6575,22 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float

                // Midlevel: the height that means "don't move". At 0 the surface only ever bulges outwards;
                // at 0.5 mid-grey is neutral and darker texels cut inwards.
-                m_preview_params_dirty |= float_row("##midlevel", _L("Midlevel"), &layer.midlevel, 0.f, 10.f, "%.2f", false, card_pad);
-                hover_tip(_u8L("Which gray stays where the surface already is. At 0 the texture only pushes "
-                               "outwards; at 0.5 mid-gray stays put, so darker grays cut in and lighter ones "
-                               "still push out - one image both embosses and engraves.\n\n"
-                               "What cuts in has to fit: inside a sharp corner or through a thin wall, a deep "
-                               "cut can pass through the other side."));
+                m_preview_params_dirty |= float_row("##midlevel", _L("Midlevel"), &layer.midlevel, 0.f, 10.f, "%.2f", false, card_pad,
+                                                    _L("Which gray stays where the surface already is. At 0 the texture only pushes "
+                                                       "outwards; at 0.5 mid-gray stays put, so darker grays cut in and lighter ones "
+                                                       "still push out - one image both embosses and engraves.\n\n"
+                                                       "What cuts in has to fit: inside a sharp corner or through a thin wall, a deep "
+                                                       "cut can pass through the other side."));
                if (layer.midlevel > 0.f && layer.depth_mm > 1.f) {
                    ImGui::PushTextWrapPos(content_rx - card_pad);
                    m_imgui->warning_text(_L("Deep inward displacement may self-intersect."));
                    ImGui::PopTextWrapPos();
                }

-                m_preview_params_dirty |= float_row("##smoothing", _L("Smoothing"), &layer.smoothing, 0.f, 1.f, "%.2f", false, card_pad);
-                hover_tip(_u8L("Blurs the image before it is used, which rounds off hard steps and removes "
-                               "speckle from a noisy photo. Raise it if the relief looks harsh or grainy; it "
-                               "costs fine detail."));
+                m_preview_params_dirty |= float_row("##smoothing", _L("Smoothing"), &layer.smoothing, 0.f, 1.f, "%.2f", false, card_pad,
+                                                    _L("Blurs the image before it is used, which rounds off hard steps and removes "
+                                                       "speckle from a noisy photo. Raise it if the relief looks harsh or grainy; it "
+                                                       "costs fine detail."));

                // Edge fade: the relief flattens toward the boundary of the painted area.
                m_preview_params_dirty |= m_imgui->bbl_checkbox(_L("Edge fade") + "##edge_smoothing", layer.edge_smoothing);
@@ -6498,12 +6598,11 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                               "blends into the bare surface instead of stopping at a step."));
                ImGui::SameLine();
                m_imgui->disabled_begin(!layer.edge_smoothing);
-                ImGui::SetNextItemWidth(-card_pad);
-                m_preview_params_dirty |= ImGui::SliderFloat("##edge_amount", &layer.edge_smoothing_amount, 0.02f, 1.f, "%.2f",
-                                                             ImGuiSliderFlags_AlwaysClamp);
+                m_preview_params_dirty |= typed_slider("##edge_amount", -(card_pad + edit_icon_room),
+                                                       &layer.edge_smoothing_amount, 0.02f, 1.f, "%.2f", false,
+                                                       _L("How far in the fade reaches, as a share of the painted area. Small "
+                                                          "values soften a narrow band at the edge; 1 flattens almost all of it."));
                m_imgui->disabled_end();
-                hover_tip(_u8L("How far in the fade reaches, as a share of the painted area. Small values "
-                               "soften a narrow band at the edge; 1 flattens almost all of it."));

                // Invert and Colours share a row.
                {
@@ -6548,19 +6647,19 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            // Every mix can become a filament slot, and there are only so many beside the
                            // physical filaments.
                            const int max_mixes = std::max(1, int(EnforcerBlockerType::ExtruderMax) - int(m_palette_filaments.size()));
-                            if (int_row("##color_mix_count", _L("Mixed colors"), &opts.color_mix_count, 1, max_mixes, "%d", card_pad))
+                            if (int_row("##color_mix_count", _L("Mixed colors"), &opts.color_mix_count, 1, max_mixes, "%d", card_pad,
+                                        _L("The most mixed filaments a bake may add. They are picked from the "
+                                           "texture's colors, and only the ones the bake actually uses are created.")))
                                m_preview_params_dirty = true;
-                            hover_tip(_u8L("The most mixed filaments a bake may add. They are picked from the "
-                                           "texture's colors, and only the ones the bake actually uses are created."));
                            // After the slider, so a change shows in the same frame.
                            ImGui::TextDisabled("%s", Slic3r::format(_u8L("%1% printable colors from %2% filaments"),
                                                                     int(cached_palette().size()), int(m_palette_filaments.size())).c_str());
                        }
-                        if (int_row("##color_despeckle", _L("Denoise"), &opts.color_despeckle, 0, 6, "%d", card_pad))
-                            m_preview_params_dirty = true;
-                        hover_tip(_u8L("Cleans up single stray triangles of the wrong color, which detail finer "
+                        if (int_row("##color_despeckle", _L("Denoise"), &opts.color_despeckle, 0, 6, "%d", card_pad,
+                                    _L("Cleans up single stray triangles of the wrong color, which detail finer "
                                       "than the mesh leaves behind. Raise it if the result looks speckled, "
-                                       "lower it if small features are being swallowed."));
+                                       "lower it if small features are being swallowed.")))
+                            m_preview_params_dirty = true;
                    }
                }

@@ -6665,10 +6764,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                                    "gets the texture, and its border becomes the edge of the projection."));

                    if (projector_open) {
-                        if (int_row("##projector_opacity", _L("Opacity"), &m_projector_opacity, 20, 255, "%d", card_pad))
+                        if (int_row("##projector_opacity", _L("Opacity"), &m_projector_opacity, 20, 255, "%d", card_pad,
+                                    _L("How solid the frame window looks while you place it. Lower to see the "
+                                       "model through it; it does not affect the result.")))
                            m_projector_frame->set_opacity(m_projector_opacity);
-                        hover_tip(_u8L("How solid the frame window looks while you place it. Lower to see the "
-                                       "model through it; it does not affect the result."));

                        if (m_imgui->button(_u8L("Apply projection frame"))) {
                            const int painted_count = apply_projection_frame();
@@ -6969,57 +7068,57 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            // pattern can sample four points that all happen to land at similar heights, report no error,
            // and stall before refinement ever starts.
            if (float_row("##subdiv_target", m_subdivide_feature ? _L("Max edge") : _L("Target edge"), &m_subdivide_target_mm,
-                          0.001f, 20.f, "%.3f mm", true, 0.f))
+                          0.001f, 20.f, "%.3f mm", true, 0.f,
+                          m_subdivide_feature ?
+                              _L("No triangle in the painted area stays larger than this, even where the texture "
+                                 "is flat. Keep it near the size of the smallest feature you want to come out.") :
+                              _L("Triangles in the painted area are split until none is larger than this. Smaller "
+                                 "means finer detail and, fast, a lot more triangles.")))
                preview_live();
-            hover_tip(m_subdivide_feature ?
-                          _u8L("No triangle in the painted area stays larger than this, even where the texture "
-                               "is flat. Keep it near the size of the smallest feature you want to come out.") :
-                          _u8L("Triangles in the painted area are split until none is larger than this. Smaller "
-                               "means finer detail and, fast, a lot more triangles."));

            if (m_subdivide_feature) {
-                if (float_row("##subdiv_detail", _L("Detail"), &m_subdivide_detail_mm, 0.001f, 1.f, "%.3f mm", true, 0.f))
+                if (float_row("##subdiv_detail", _L("Detail"), &m_subdivide_detail_mm, 0.001f, 1.f, "%.3f mm", true, 0.f,
+                              _L("How far the mesh may sit from the shape the texture describes, in millimetres. "
+                                 "Smaller follows fine detail and costs triangles; larger only chases the big "
+                                 "features.")))
                    preview_live();
-                hover_tip(_u8L("How far the mesh may sit from the shape the texture describes, in millimetres. "
-                               "Smaller follows fine detail and costs triangles; larger only chases the big "
-                               "features."));
-                if (float_row("##subdiv_min", _L("Min edge"), &m_subdivide_min_edge_mm, 0.001f, 20.f, "%.3f mm", true, 0.f))
+                if (float_row("##subdiv_min", _L("Min edge"), &m_subdivide_min_edge_mm, 0.001f, 20.f, "%.3f mm", true, 0.f,
+                              _L("A floor on triangle size, so a sharp step in the texture cannot be chased "
+                                 "forever. Lower it for finer relief, raise it if the count runs away at hard "
+                                 "edges.")))
                    preview_live();
-                hover_tip(_u8L("A floor on triangle size, so a sharp step in the texture cannot be chased "
-                               "forever. Lower it for finer relief, raise it if the count runs away at hard "
-                               "edges."));
            }

            // Applies in both adaptive sub-modes: it is about the step the bake puts at the paint's edge, which
            // exists whether or not "Follow texture detail" is on. 0 turns the band off.
-            if (float_row("##subdiv_border", _L("Edge detail"), &m_subdivide_border_mm, 0.f, 5.f, "%.3f mm", false, 0.f))
+            if (float_row("##subdiv_border", _L("Edge detail"), &m_subdivide_border_mm, 0.f, 5.f, "%.3f mm", false, 0.f,
+                          _L("Triangle size along the outline of the painted area, where the relief drops back to the "
+                             "bare surface. Lower it if that rim looks jagged; it only costs triangles along the "
+                             "outline. 0 turns it off.")))
                preview_live();
-            hover_tip(_u8L("Triangle size along the outline of the painted area, where the relief drops back to the "
-                            "bare surface. Lower it if that rim looks jagged; it only costs triangles along the "
-                            "outline. 0 turns it off."));

            // Only worth showing when a layer is actually colouring: with no colour there is no boundary for it
            // to refine and the control would do nothing whatever it is set to.
            if (mv != nullptr && any_layer_colors(*mv)) {
-                if (float_row("##subdiv_color", _L("Color detail"), &m_subdivide_color_mm, 0.f, 5.f, "%.3f mm", false, 0.f))
+                if (float_row("##subdiv_color", _L("Color detail"), &m_subdivide_color_mm, 0.f, 5.f, "%.3f mm", false, 0.f,
+                              _L("Triangle size where two colors meet. Each triangle prints in one filament, so a "
+                                 "color edge can only be as sharp as the triangles along it - and nothing else "
+                                 "refines there, since the surface is flat across a change of color. 0 turns it off.")))
                    preview_live();
-                hover_tip(_u8L("Triangle size where two colors meet. Each triangle prints in one filament, so a "
-                                "color edge can only be as sharp as the triangles along it - and nothing else "
-                                "refines there, since the surface is flat across a change of color. 0 turns it off."));
            }

            ImGui::TextDisabled("%s", _u8L("Triangle budget: set with Triangles, below.").c_str());
            if (m_subdivide_editing && m_subdivide_preview_tris > 0)
                m_imgui->text(Slic3r::format(_u8L("Preview: %1% triangles"), m_subdivide_preview_tris));
        } else {
-            if (int_row("##subdiv_steps", _L("Steps"), &m_subdivide_count, 0, 5, "%d", 0.f)) {
+            if (int_row("##subdiv_steps", _L("Steps"), &m_subdivide_count, 0, 5, "%d", 0.f,
+                        _L("Splits every triangle of the model into four, this many times over. Each step "
+                           "quadruples the count - 3 turns 100 k triangles into 6.4 M - so prefer refining "
+                           "only the painted area unless you need the whole model finer."))) {
                if (m_subdivide_editing)
                    rebuild_subdivide_preview(); // a count of 0 clears the preview, it doesn't compute one
                m_parent.set_as_dirty();
            }
-            hover_tip(_u8L("Splits every triangle of the model into four, this many times over. Each step "
-                           "quadruples the count - 3 turns 100 k triangles into 6.4 M - so prefer refining "
-                           "only the painted area unless you need the whole model finer."));
        }

        {
@@ -7081,9 +7180,9 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                }
            m_remesh_target_edge_mm = cnt > 0 ? std::clamp(float(sum / double(cnt)), 0.1f, 20.f) : 1.f;
        }
-        float_row("##remesh_edge", _L("Target edge"), &m_remesh_target_edge_mm, 0.1f, 20.f, "%.2f mm", true, 0.f);
-        hover_tip(_u8L("Triangle size the whole model is rebuilt with, in millimetres. Displacement works best on an "
-                        "even mesh; this is what makes one out of an uneven import."));
+        float_row("##remesh_edge", _L("Target edge"), &m_remesh_target_edge_mm, 0.1f, 20.f, "%.2f mm", true, 0.f,
+                  _L("Triangle size the whole model is rebuilt with, in millimetres. Displacement works best on an "
+                     "even mesh; this is what makes one out of an uneven import."));

        m_imgui->bbl_checkbox(_L("Keep sharp edges") + "##remesh_sharp", m_remesh_keep_sharp_edges);
        hover_tip(_u8L("Holds hard edges and open borders in place while the rest is remeshed. Without it "
@@ -7091,11 +7190,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                       "a cube comes back with wobbly edges."));
        ImGui::SameLine();
        m_imgui->disabled_begin(!m_remesh_keep_sharp_edges);
-        ImGui::SetNextItemWidth(-1.f);
-        ImGui::SliderFloat("##remesh_sharp_angle", &m_remesh_sharp_angle_deg, 5.f, 90.f, "%.0f°", ImGuiSliderFlags_AlwaysClamp);
-        m_imgui->disabled_end();
-        hover_tip(_u8L("How sharp a fold has to be, in degrees, before the remesher treats it as an edge worth "
+        typed_slider("##remesh_sharp_angle", -(1.f + edit_icon_room), &m_remesh_sharp_angle_deg, 5.f, 90.f, "%.0f°", false,
+                     _L("How sharp a fold has to be, in degrees, before the remesher treats it as an edge worth "
                        "keeping. Lower protects more of the model's shape; higher rebuilds more of it evenly."));
+        m_imgui->disabled_end();

        m_imgui->disabled_begin(mv == nullptr || busy);
        if (ImGui::Button(_u8L("Remesh").c_str()))
@@ -7123,16 +7221,16 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            "on a layer is a different thing: it blurs the image before it is used."));
            if (opts.smooth_enabled) {
                float percent = opts.smooth_strength * 100.f;
-                if (float_row("##dispsmooth", _L_CONTEXT("Strength", "Texture Displacement"), &percent, 1.f, 100.f, "%.0f %%", false, 0.f)) {
+                if (float_row("##dispsmooth", _L_CONTEXT("Strength", "Texture Displacement"), &percent, 1.f, 100.f, "%.0f %%", false, 0.f,
+                              _L("How far each pass pulls a vertex towards its neighbours. High values round the "
+                                 "relief off quickly; low values need more passes but keep more of the detail."))) {
                    opts.smooth_strength   = std::clamp(percent / 100.f, 0.01f, 1.f);
                    m_preview_params_dirty = true;
                }
-                hover_tip(_u8L("How far each pass pulls a vertex towards its neighbours. High values round the "
-                               "relief off quickly; low values need more passes but keep more of the detail."));
-                if (int_row("##dispsmoothit", _L("Passes"), &opts.smooth_iterations, 1, 10, "%d", 0.f))
+                if (int_row("##dispsmoothit", _L("Passes"), &opts.smooth_iterations, 1, 10, "%d", 0.f,
+                            _L("How many smoothing passes to run. More passes spread the smoothing further across "
+                               "the surface; Strength decides how much each one moves.")))
                    m_preview_params_dirty = true;
-                hover_tip(_u8L("How many smoothing passes to run. More passes spread the smoothing further across "
-                                "the surface; Strength decides how much each one moves."));

                m_preview_params_dirty |= m_imgui->bbl_checkbox(_L("Ignore outer ring"), opts.smooth_skip_border);
                hover_tip(_u8L("Keeps the outer ring of the painted area out of the smoothing. Its neighbours "
@@ -7175,16 +7273,16 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            int        shown_k     = auto_budget ? v2_recommendation(*mv).budget_k : opts.v2_max_triangles_k;
            m_imgui->disabled_begin(auto_budget);
            // TRN Slider value: %d is the triangle budget in thousands
-            if (int_row("##v2budget", _L("Budget"), &shown_k, 0, 4000, auto_budget ? _u8L("%d k (auto)").c_str() : "%d k", 0.f)) {
+            if (int_row("##v2budget", _L("Budget"), &shown_k, 0, 4000, auto_budget ? _u8L("%d k (auto)").c_str() : "%d k", 0.f,
+                        _L("How many thousand triangles this bake may spend on the area you painted. "
+                           "Relief already baked into the rest of the model is kept on top of it, so a "
+                           "second bake somewhere else gets the same budget as the first. Raise it if the "
+                           "warning below Resolution says the detail will not fit; 0 keeps every triangle "
+                           "the refinement produced, however many that is."))) {
                opts.v2_max_triangles_k = shown_k;
                m_preview_params_dirty  = true;
            }
            m_imgui->disabled_end();
-            hover_tip(_u8L("How many thousand triangles this bake may spend on the area you painted. "
-                           "Relief already baked into the rest of the model is kept on top of it, so a "
-                           "second bake somewhere else gets the same budget as the first. Raise it if the "
-                           "warning below Resolution says the detail will not fit; 0 keeps every triangle "
-                           "the refinement produced, however many that is."));
        }
        if (SHOW_PIPELINE_DEV_CONTROLS && opts.pipeline_v2) {
            // Keeping the relief above the plate is not a checkbox: it is unconditional, in both pipelines
@@ -7291,26 +7389,28 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                           "default. Untick to set both yourself - worth doing for a texture much finer or "
                           "much coarser than the part it sits on."));
            ImGui::SameLine();
-            ImGui::SetNextItemWidth(x0 + panel_w - ImGui::GetCursorPosX());
            float shown = auto_res ? rec.edge_mm : opts.v2_refine_mm;
+            // Held in a local: the format outlives the call that reads it, and the slider and the
+            // range in its tooltip are then formatted the same way.
+            const std::string v2edge_format = auto_res ? _u8L("%.2f mm (auto)") : std::string("%.2f mm");
+            const wxString    v2edge_tip =
+                auto_res && rec.edge_mm > 0.f ?
+                    from_u8(Slic3r::format(_u8L("Chosen from the size of the model: %1$.2f mm triangles, "
+                                                "budget %2% k. Untick Auto to set them yourself."),
+                                           rec.edge_mm, rec.budget_k)) :
+                    _L("How fine the mesh is made under the paint, in millimetres. It has to be "
+                       "smaller than the detail you want out of the texture - a 0.5 mm groove needs "
+                       "triangles well under 0.5 mm. Smaller costs triangles fast: halving it needs "
+                       "four times as many, and once they no longer fit the budget the bake simplifies "
+                       "back down and the detail goes with it.");
            m_imgui->disabled_begin(busy || auto_res);
-            if (ImGui::SliderFloat("##v2edge", &shown, 0.02f, 2.f, auto_res ? _u8L("%.2f mm (auto)").c_str() : "%.2f mm",
-                                   ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic)) {
+            if (typed_slider("##v2edge", x0 + panel_w - ImGui::GetCursorPosX() - edit_icon_room, &shown, 0.02f, 2.f,
+                             v2edge_format.c_str(), true, v2edge_tip)) {
                opts.v2_refine_mm      = shown;
                m_preview_params_dirty = true;
                m_parent.set_as_dirty();
            }
            m_imgui->disabled_end();
-            if (auto_res && rec.edge_mm > 0.f)
-                hover_tip(Slic3r::format(_u8L("Chosen from the size of the model: %1$.2f mm triangles, "
-                                              "budget %2% k. Untick Auto to set them yourself."),
-                                          rec.edge_mm, rec.budget_k));
-            else
-                hover_tip(_u8L("How fine the mesh is made under the paint, in millimetres. It has to be "
-                               "smaller than the detail you want out of the texture - a 0.5 mm groove needs "
-                               "triangles well under 0.5 mm. Smaller costs triangles fast: halving it needs "
-                               "four times as many, and once they no longer fit the budget the bake simplifies "
-                               "back down and the detail goes with it."));

            // What this resolution costs over what is painted, against what the budget allows. Refining
            // past the budget is not an error - the bake simplifies back down to it - but the result
@@ -7342,18 +7442,17 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            m_imgui->text(_L("Triangles"));
            ImGui::SameLine();
            ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + label_w));
-            ImGui::SetNextItemWidth(x0 + panel_w - ImGui::GetCursorPosX());
            m_imgui->disabled_begin(busy);
-            if (ImGui::SliderInt("##subdivbudget", &m_subdivide_budget_k, 10, 2000, "+%d k",
-                                 ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic)) {
+            if (typed_slider_int("##subdivbudget", x0 + panel_w - ImGui::GetCursorPosX() - edit_icon_room,
+                                 &m_subdivide_budget_k, 10, 2000, "+%d k", true,
+                                 _L("How many thousand triangles the refinement may add to the model. The triangle "
+                                    "that fits worst is always split first, so even a run that spends the lot has "
+                                    "spent it where it shows most. Raise it if the relief still looks coarse."))) {
                if (m_subdivide_editing)
                    rebuild_subdivide_preview();
                m_parent.set_as_dirty();
            }
            m_imgui->disabled_end();
-            hover_tip(_u8L("How many thousand triangles the refinement may add to the model. The triangle "
-                           "that fits worst is always split first, so even a run that spends the lot has "
-                           "spent it where it shows most. Raise it if the relief still looks coarse."));
        }

        const float button_h = std::round(frame_h * 1.25f);
@@ -7372,7 +7471,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            : m_tool_type == ToolType::SMART_FILL  ? m_shortcuts_bucket_fill 
            : m_tool_type == ToolType::BRUSH       ? m_shortcuts_brush 
            : m_tool_type == ToolType::GAP_FILL    ? m_shortcuts_gap_fill 
-            : std::vector<std::pair<wxString, wxString>>{};
+            : m_shortcuts_sliders; // the sliders are there whether or not a painting tool is

        ImGui::SetCursorPosY(row_y + (row_h - icon_h) * .5f); // center vertically
        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(int(m_imgui->scaled(.5f)), style.ItemSpacing.y));
@@ -404,6 +404,12 @@ private:
    // Per slot: whether the layer's card shows every setting or only Depth, Tile size and Rotation.
    // Panel state only, not saved with the project.
    std::array<bool, TEXTURE_DISPLACEMENT_MAX_LAYERS> m_layer_expanded{};
+    // The slider whose edit icon was just clicked, as its ImGui id, and the frame it was clicked on.
+    // The row acts on it on the next frame - ImGui's keyboard-focus request only takes effect a frame
+    // later - and clears it; the frame number is what retires a request whose row has gone off screen
+    // in the meantime. Panel state only, not saved with the project.
+    std::string m_slider_type_request;
+    int         m_slider_type_request_frame = 0;

    // "Adjust Texture" mode: instead of painting, dragging an on-canvas handle changes the active
    // layer's offset. The handle is a flat panel lying in the paint patch's own tangent plane
@@ -1016,6 +1022,9 @@ private:
    std::vector<std::pair<wxString, wxString>> m_shortcuts_bucket_fill;
    // Contains all shortcuts in the format of {shortcut, description}, e.g. {alt + _L("Left mouse button"), _L("Part_selection")}
    std::vector<std::pair<wxString, wxString>> m_shortcuts_gap_fill;
+    // The two ways every slider in the panel takes a typed value. They hold whatever tool is selected,
+    // so they are tacked onto each of the lists above and stand on their own when no tool is active.
+    std::vector<std::pair<wxString, wxString>> m_shortcuts_sliders;

    // Icons for the panel's icon buttons (tools, views, mapping, tiling, layer actions). Loaded through IconManager with
    // the same colour/monochrome variants the main toolbar uses, so an inactive button shows the icon in
@@ -82,11 +82,6 @@ ComboBox::ComboBox(wxWindow *parent,
        e.SetId(GetId());
        GetEventHandler()->ProcessEvent(e);
    });
-    drop.Bind(EVT_DROPDOWN_ITEM_ACTION, [this](wxCommandEvent &e) {
-        e.SetEventObject(this);
-        e.SetId(GetId());
-        GetEventHandler()->ProcessEvent(e);
-    });
    drop.Bind(EVT_DISMISS, [this](auto &) {
        drop_down = false;
        wxCommandEvent e(wxEVT_COMBOBOX_CLOSEUP);
@@ -256,7 +251,7 @@ int ComboBox::Append(const wxString &text,
                     int style)
 {
    auto valid_bit_map = bitmap.IsOk() ? bitmap : wxNullBitmap;
-    Item item{text, wxEmptyString, valid_bit_map, valid_bit_map, wxNullBitmap, clientData, group_key, group_label};
+    Item item{text, wxEmptyString, valid_bit_map, valid_bit_map, clientData, group_key, group_label};
    item.style = style;
    items.push_back(item);
    SetClientDataType(wxClientData_Void);
@@ -302,12 +297,6 @@ void ComboBox::ForceDropdownOpen()
    }
 }

-void ComboBox::CloseDropdown()
-{
-    if (drop.IsShown())
-        drop.DismissAndNotify();
-}
-
 unsigned int ComboBox::GetCount() const { return items.size(); }

 void ComboBox::set_replace_text(wxString text, wxString image_name)
@@ -361,13 +350,6 @@ void ComboBox::SetItemBitmap(unsigned int n, wxBitmap const &bitmap)
    drop.Invalidate();
 }

-void ComboBox::SetItemActionBitmap(unsigned int n, wxBitmap const &bitmap)
-{
-    if (n >= items.size()) return;
-    items[n].action_icon = bitmap.IsOk() ? bitmap : wxNullBitmap;
-    drop.Invalidate();
-}
-
 int ComboBox::DoInsertItems(const wxArrayStringsAdapter &items,
                            unsigned int                 pos,
                            void **                      clientData,
@@ -375,7 +357,7 @@ int ComboBox::DoInsertItems(const wxArrayStringsAdapter &items,
 {
    if (pos > this->items.size()) return -1;
    for (int i = 0; i < items.GetCount(); ++i) {
-        Item item { items[i], wxEmptyString, wxNullBitmap, wxNullBitmap, wxNullBitmap, clientData ? clientData[i] : NULL };
+        Item item { items[i], wxEmptyString, wxNullBitmap, wxNullBitmap, clientData ? clientData[i] : NULL };
        this->items.insert(this->items.begin() + pos, item);
        ++pos;
    }
@@ -437,18 +419,16 @@ void ComboBox::keyDown(wxKeyEvent& event)
        case WXK_UP:
        case WXK_DOWN:
        case WXK_LEFT:
-        case WXK_RIGHT: {
-            // Step over disabled rows: the mouse cannot select them either.
-            const int step = (event.GetKeyCode() == WXK_UP || event.GetKeyCode() == WXK_LEFT) ? -1 : 1;
-            int       n    = GetSelection() + step;
-            while (n >= 0 && n < int(items.size()) && (items[n].style & DD_ITEM_STYLE_DISABLED))
-                n += step;
-            if (n < 0 || n >= int(items.size()))
+        case WXK_RIGHT:
+            if ((event.GetKeyCode() == WXK_UP || event.GetKeyCode() == WXK_LEFT) && GetSelection() > 0) {
+                SetSelection(GetSelection() - 1);
+            } else if ((event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_RIGHT) && GetSelection() + 1 < items.size()) {
+                SetSelection(GetSelection() + 1);
+            } else {
                break;
-            SetSelection(n);
+            }
            sendComboBoxEvent();
            break;
-        }
        case WXK_TAB:
            HandleAsNavigationKey(event);
            break;
@@ -96,12 +96,10 @@ public:

    wxBitmap GetItemBitmap(unsigned int n);
    void     SetItemBitmap(unsigned int n, wxBitmap const &bitmap);
-    void     SetItemActionBitmap(unsigned int n, wxBitmap const &bitmap);
    bool     is_drop_down(){return drop_down;}
    void     DeleteOneItem(unsigned int pos) { DoDeleteOneItem(pos); }

    void ForceDropdownOpen();
-    void CloseDropdown();

 protected:
    virtual int  DoInsertItems(const wxArrayStringsAdapter &items,
@@ -30,7 +30,6 @@
 #include "slic3r/GUI/wxExtensions.hpp"

 wxDEFINE_EVENT(EVT_DISMISS, wxCommandEvent);
-wxDEFINE_EVENT(EVT_DROPDOWN_ITEM_ACTION, wxCommandEvent);

 BEGIN_EVENT_TABLE(DropDown, PopupWindow)

@@ -243,19 +242,6 @@ static wxSize GetBmpSize(wxBitmap & bmp)
 #endif
 }

-// The x-range [first, second) of the column at the right of the rows that holds the items' action
-// icons, empty when no item has one. render() draws the icons in it and mouseReleased() hit-tests
-// clicks against it, so the drawn icon and its clickable area always match.
-std::pair<int, int> DropDown::actionColumn() const
-{
-    if (actionIconWidth <= 0)
-        return {0, 0};
-    int right = rowSize.x;
-    if (rowSize.y * count > GetSize().y) // position bar
-        right -= 6;
-    return {right - actionIconWidth - FromDIP(16), right};
-}
-
 static void _DrawSplitItem(const wxWindow* w, wxDC& dc, wxString split_text, wxPoint start_pt, int item_width, int item_height)
 {
    // save dc
@@ -385,10 +371,6 @@ void DropDown::render(wxDC &dc)
        rcContent.width -= szBmp.x + 5;
    }

-    const auto action_column = actionColumn();
-    if (action_column.second > action_column.first)
-        rcContent.width = action_column.first - rcContent.x;
-
    std::set<wxString> groups;
    // draw texts & icons
    int index = 0;
@@ -452,24 +434,13 @@ void DropDown::render(wxDC &dc)
        auto text = group.IsEmpty()
                        ? (item.group_key.IsEmpty() ? item.text : item.group_label)
                        : item.text;
-        if (item.action_icon.IsOk()) {
-            auto action_size = GetBmpSize(item.action_icon);
-            wxPoint action_pt(action_column.second - action_size.x - FromDIP(8),
-                              rcContent.y + (rcContent.height - action_size.y) / 2);
-            dc.DrawBitmap(item.action_icon, action_pt);
-        }
-
        if (!text_off && !text.IsEmpty()) {
            wxSize tSize = dc.GetMultiLineTextExtent(text);
            if (pt.x + tSize.x > rcContent.GetRight()) {
-                int max_text_width = rcContent.GetRight() - pt.x;
-                if (max_text_width <= 0) {
-                    text.clear();
-                } else {
-                    if (is_hover && item.tip.IsEmpty())
-                        SetToolTip(text);
-                    text = wxControl::Ellipsize(text, dc, wxELLIPSIZE_END, max_text_width);
-                }
+                if (is_hover && item.tip.IsEmpty())
+                    SetToolTip(text);
+                text = wxControl::Ellipsize(text, dc, wxELLIPSIZE_END,
+                                            rcContent.GetRight() - pt.x);
            }
            pt.y += (rcContent.height - textSize.y) / 2;
            dc.SetFont(GetFont());
@@ -558,7 +529,6 @@ void DropDown::messureSize()
    if (!need_sync) return;
    textSize = wxSize();
    iconSize = wxSize();
-    actionIconWidth = 0;
    count = 0;
    wxClientDC dc(GetParent() ? GetParent() : this);
    dc.SetFont(GetFont());
@@ -595,13 +565,8 @@ void DropDown::messureSize()
                size1.x += size2.x + (text_off ? 0 : 5);
            }
        }
-        if (item.action_icon.IsOk())
-            actionIconWidth = std::max(actionIconWidth, GetBmpSize(item.action_icon).x);
        if (size1.x > textSize.x) textSize = size1;
    }
-    // Every row leaves room for the action column, as render() and actionColumn() lay it out.
-    if (actionIconWidth > 0)
-        textSize.x += actionIconWidth + FromDIP(16);
    if (!align_icon) iconSize.x = 0;
    wxSize szContent = textSize;
    if (szContent.x < FromDIP(120) && !use_content_width)
@@ -671,11 +636,6 @@ void DropDown::messureSize()
            e.SetId(GetId());
            GetEventHandler()->ProcessEvent(e);
        });
-        subDropDown->Bind(EVT_DROPDOWN_ITEM_ACTION, [this](wxCommandEvent &e) {
-            e.SetEventObject(this);
-            e.SetId(GetId());
-            GetEventHandler()->ProcessEvent(e);
-        });
    }
    need_sync = false;
 }
@@ -754,15 +714,6 @@ void DropDown::mouseReleased(wxMouseEvent& event)
        if (hover_item < 0)
            return;
        if (hover_item >= 0 && (subDropDown == nullptr || subDropDown->group.empty())) { // not moved
-            int index = hoverIndex();
-            if (index >= 0 && items[index].action_icon.IsOk()) {
-                const auto action_column = actionColumn();
-                if (event.GetX() >= action_column.first && event.GetX() < action_column.second) {
-                    sendDropDownActionEvent(index);
-                    paintNow();
-                    return;
-                }
-            }
            sendDropDownEvent();
            if (mainDropDown)
                mainDropDown->hover_item = -1; // To Dismiss mainDropDown
@@ -879,17 +830,6 @@ void DropDown::sendDropDownEvent()
    GetEventHandler()->ProcessEvent(event);
 }

-void DropDown::sendDropDownActionEvent(int index)
-{
-    if (index < 0 || index >= int(items.size()) || (items[index].style & DD_ITEM_STYLE_DISABLED))
-        return;
-    wxCommandEvent event(EVT_DROPDOWN_ITEM_ACTION, GetId());
-    event.SetEventObject(this);
-    event.SetInt(index);
-    event.SetString(items[index].text);
-    GetEventHandler()->ProcessEvent(event);
-}
-
 void DropDown::Dismiss()
 {
    if (subDropDown && subDropDown->IsShown())
@@ -5,7 +5,6 @@
 #include <wx/event.h>
 #include <vector>
 #include <cstddef>
-#include <utility>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <boost/date_time/posix_time/ptime.hpp>
@@ -28,7 +27,6 @@ class wxWindow;
 #define DD_ITEM_STYLE_DIMMED      0x0004 // gray text, but still selectable

 wxDECLARE_EVENT(EVT_DISMISS, wxCommandEvent);
-wxDECLARE_EVENT(EVT_DROPDOWN_ITEM_ACTION, wxCommandEvent);

 class DropDown : public PopupWindow
 {
@@ -39,7 +37,6 @@ public:
        wxString text_static_tips;// display static tips for TextInput.eg.PrinterInfoBox
        wxBitmap icon;
        wxBitmap icon_textctrl;// display icon for TextInput.eg.PrinterInfoBox
-        wxBitmap action_icon;
        void *   data{nullptr};
        wxString group_key{};
        wxString group_label{};
@@ -68,7 +65,6 @@ private:

    wxSize textSize;
    wxSize iconSize;
-    int    actionIconWidth = 0;
    wxSize rowSize;

    StateHandler state_handler;
@@ -139,7 +135,6 @@ private:
    int hoverIndex();

    int selectedItem();
-    std::pair<int, int> actionColumn() const;

    friend class ComboBox;
    void messureSize();
@@ -153,7 +148,6 @@ private:
    void mouseWheelMoved(wxMouseEvent &event);

    void sendDropDownEvent();
-    void sendDropDownActionEvent(int index);


    DECLARE_EVENT_TABLE()
@@ -2043,40 +2043,3 @@ TEST_CASE("3MF XML entries declaring more than an int can hold fail to load", "[
        CHECK_FALSE(parser.check_3mf_from_prusa(path));
    }
 }
-
-TEST_CASE("Loading a gcode.3mf from a stream keeps the plate's pick and pattern file paths", "[3mf][Regression]")
-{
-    Model model;
-    REQUIRE(load_stl((std::string(TEST_DATA_DIR) + "/test_3mf/Prusa.stl").c_str(), &model));
-    model.add_default_instances();
-    ScopedTemporaryDir backup_dir("orca_pick");
-    model.set_backup_path(backup_dir.string());
-    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
-
-    auto plate = std::make_unique<PlateData>();
-    plate->plate_index       = 0;
-    plate->pick_file         = (backup_dir.path() / "pick.png").string();
-    plate->pattern_bbox_file = (backup_dir.path() / "plate.json").string();
-
-    ScopedTemporaryFile temp(".3mf");
-    const std::string   test_file = temp.string();
-    StoreParams store_params;
-    store_params.path   = test_file.c_str();
-    store_params.model  = &model;
-    store_params.config = &config;
-    store_params.plate_data_list.push_back(plate.get());
-    store_params.strategy = SaveStrategy::Zip64 | SaveStrategy::Silence;
-    REQUIRE(store_bbs_3mf(store_params));
-
-    boost::nowide::ifstream in(test_file, std::ios::binary);
-    Model              dst_model;
-    DynamicPrintConfig dst_config;
-    PlateDataPtrs      dst_plates;
-    Semver             file_version;
-    dst_model.set_backup_path(backup_dir.string());
-    REQUIRE(load_gcode_3mf_from_stream(in, &dst_config, &dst_model, &dst_plates, &file_version));
-    REQUIRE(dst_plates.size() == 1);
-    CHECK(dst_plates.front()->pick_file == "Metadata/pick_1.png");
-    CHECK(dst_plates.front()->pattern_bbox_file == "Metadata/plate_1.json");
-    release_PlateData_list(dst_plates);
-}