mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Improvements for 15902766d0
This commit is contained in:
parent
d87f2d11ae
commit
4171a6a80d
2 changed files with 13 additions and 10 deletions
|
@ -839,7 +839,8 @@ void ObjectList::list_manipulation(bool evt_context_menu/* = false*/)
|
||||||
fix_through_netfabb();
|
fix_through_netfabb();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (/*wxOSX &&*/evt_context_menu && title == _("Extruder"))
|
// workaround for extruder editing under OSX
|
||||||
|
else if (wxOSX && evt_context_menu && title == _("Extruder"))
|
||||||
extruder_editing();
|
extruder_editing();
|
||||||
|
|
||||||
#ifndef __WXMSW__
|
#ifndef __WXMSW__
|
||||||
|
@ -895,15 +896,12 @@ void ObjectList::extruder_editing()
|
||||||
const int column_width = GetColumn(colExtruder)->GetWidth();
|
const int column_width = GetColumn(colExtruder)->GetWidth();
|
||||||
|
|
||||||
wxPoint pos = get_mouse_position_in_control();
|
wxPoint pos = get_mouse_position_in_control();
|
||||||
|
pos.x = GetColumn(colName)->GetWidth() + GetColumn(colPrint)->GetWidth();
|
||||||
pos.y -= 2*GetTextExtent("m").y;
|
// pos.y -= 2*GetTextExtent("m").y;
|
||||||
|
|
||||||
wxWindow* parent = this;//this->GetMainWindow();
|
|
||||||
|
|
||||||
if (!m_extruder_editor)
|
if (!m_extruder_editor)
|
||||||
m_extruder_editor = new wxBitmapComboBox(parent, wxID_ANY, wxEmptyString,
|
m_extruder_editor = new wxBitmapComboBox(this, wxID_ANY, wxEmptyString, pos, wxSize(column_width, -1),
|
||||||
pos, wxSize(column_width, -1),
|
0, nullptr, wxCB_READONLY);
|
||||||
0, nullptr, wxCB_READONLY);
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_extruder_editor->SetPosition(pos);
|
m_extruder_editor->SetPosition(pos);
|
||||||
|
|
|
@ -580,8 +580,13 @@ private:
|
||||||
class BitmapChoiceRenderer : public wxDataViewCustomRenderer
|
class BitmapChoiceRenderer : public wxDataViewCustomRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BitmapChoiceRenderer(wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
|
BitmapChoiceRenderer(wxDataViewCellMode mode =
|
||||||
int align = wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL
|
#ifdef __WXOSX__
|
||||||
|
wxDATAVIEW_CELL_INERT
|
||||||
|
#else
|
||||||
|
wxDATAVIEW_CELL_EDITABLE
|
||||||
|
#endif
|
||||||
|
,int align = wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL
|
||||||
) : wxDataViewCustomRenderer(wxT("DataViewBitmapText"), mode, align) {}
|
) : wxDataViewCustomRenderer(wxT("DataViewBitmapText"), mode, align) {}
|
||||||
|
|
||||||
bool SetValue(const wxVariant& value);
|
bool SetValue(const wxVariant& value);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue