GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 13:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#657 UI niggles & full_width

Browse Source
This commit is contained in:
supermerill 2020-11-11 22:20:12 +01:00
parent fbcc656937
commit 5519eeef98
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/ui_layout/print.ui
View File

@ -18,7 +18,7 @@ group:Horizontal shells
group:Quality group:Quality
line:Only one perimeter on Top surfaces line:Only one perimeter on Top surfaces
setting:label$ :only_one_perimeter_top setting:label$ :only_one_perimeter_top
setting:label$Minimum width:min_width_top_surface setting:label$Minimum width:sidetext_width$7:min_width_top_surface
end_line end_line
line:Extra perimeters line:Extra perimeters
setting:extra_perimeters_overhangs setting:extra_perimeters_overhangs
@ -201,7 +201,7 @@ group:Options for support material interface
setting:support_material_interface_contact_loops setting:support_material_interface_contact_loops
page:Speed:time page:Speed:time
group:label_width$8:Speed for print moves group:label_width$8:sidetext_width$7:Speed for print moves
line:Perimeter speed line:Perimeter speed
setting:width$4:perimeter_speed setting:width$4:perimeter_speed
setting:width$4:external_perimeter_speed setting:width$4:external_perimeter_speed
@ -227,7 +227,7 @@ group:label_width$8:Speed for print moves
setting:label$Ironing post-process speed:label_width$30:width$4:ironing_speed setting:label$Ironing post-process speed:label_width$30:width$4:ironing_speed
group:Speed for non-print moves group:Speed for non-print moves
setting:travel_speed setting:travel_speed
group:Modifiers group:sidetext_width$7:Modifiers
line:First layer speed line:First layer speed
setting:label_width$8:width$4:first_layer_speed setting:label_width$8:width$4:first_layer_speed
setting:label_width$8:width$4:first_layer_infill_speed setting:label_width$8:width$4:first_layer_infill_speed
@ -264,7 +264,7 @@ group:Overlap
setting:label$External:external_perimeter_overlap setting:label$External:external_perimeter_overlap
setting:label$Gap Fill:gap_fill_overlap setting:label$Gap Fill:gap_fill_overlap
end_line end_line
setting:infill_overlap setting:sidetext_width$7:infill_overlap
setting:bridge_overlap setting:bridge_overlap
group:Flow group:Flow
line:Flow ratio line:Flow ratio

8
src/slic3r/GUI/OG_CustomCtrl.cpp
View File

@ -539,7 +539,13 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord v_pos)
option_set.front().side_widget == nullptr && og_line.get_extra_widgets().size() == 0) option_set.front().side_widget == nullptr && og_line.get_extra_widgets().size() == 0)
{ {
if (field && field->undo_to_sys_bitmap()) if (field && field->undo_to_sys_bitmap())
draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->bmp(), field->undo_bitmap()->bmp(), field->blink()); h_pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->bmp(), field->undo_bitmap()->bmp(), field->blink());
h_pos += ctrl->m_h_gap;
//check for full_width width
if (option_set.front().opt.full_width) {
if (field->getWindow())
field->getWindow()->SetSize(this->ctrl->GetSize().x - h_pos, -1);
}
return; return;
} }