3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Prusa3d/Slic3r

Browse Source
This commit is contained in:
bubnikv 2019-02-21 12:09:16 +01:00
commit b84eb48bff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -44,7 +44,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
def.label = L("Name"); def.label = L("Name");
def.gui_type = "legend"; def.gui_type = "legend";
def.tooltip = L("Object name"); def.tooltip = L("Object name");
def.width = 200; def.width = 21 * wxGetApp().em_unit();
def.default_value = new ConfigOptionString{ " " }; def.default_value = new ConfigOptionString{ " " };
m_og->append_single_option_line(Option(def, "object_name")); m_og->append_single_option_line(Option(def, "object_name"));

2
src/slic3r/GUI/Tab.hpp
View File

@ -204,7 +204,7 @@ protected:
void set_type(); void set_type();
int m_em_unit; int m_em_unit;
std::set<std::string> m_dirty_options = {}; std::set<std::string> m_dirty_options;
public: public:
PresetBundle* m_preset_bundle; PresetBundle* m_preset_bundle;