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

#658 fix coPoints size computation

Browse Source
This commit is contained in:
supermerill 2020-11-15 00:11:25 +01:00
parent c8397eb3fd
commit 16d3314d9f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/Field.hpp
View File

@ -460,6 +460,7 @@ public:
x_textctrl->Disable(); x_textctrl->Disable();
y_textctrl->Disable(); } y_textctrl->Disable(); }
wxSizer* getSizer() override { return sizer; } wxSizer* getSizer() override { return sizer; }
//for height
wxWindow* getWindow() override { return dynamic_cast<wxWindow*>(x_textctrl); } wxWindow* getWindow() override { return dynamic_cast<wxWindow*>(x_textctrl); }
}; };

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

@ -202,7 +202,15 @@ wxPoint OG_CustomCtrl::get_pos(const Line& line, Field* field_in/* = nullptr*/)
if (field == field_in) if (field == field_in)
break; break;
h_pos += field->getWindow()->GetSize().x; if (field->getSizer()) {
for (auto child : field->getSizer()->GetChildren()) {
if (child->IsWindow() && child->IsShown()) {
wxSize sz = child->GetWindow()->GetSize();
h_pos += sz.x + m_h_gap;
}
}
} else
h_pos += field->getWindow()->GetSize().x;
if (option_set.size() == 1 && option_set.front().opt.full_width) if (option_set.size() == 1 && option_set.front().opt.full_width)
break; break;