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

Next try to use wxDataViewTreeCtrlComboPopup on macOS and Linux:

Browse Source 
Added: m_cc_presets_choice->UseAltPopupWindow();
       m_cc_presets_choice->EnablePopupAnimation(false);
like for wxCheckListBoxComboPopup
This commit is contained in:
YuSanka 2018-04-09 09:55:24 +02:00
parent 004f9ba1e5
commit e33db203d8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xs/src/slic3r/GUI/Tab.cpp
View File

@ -45,8 +45,9 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle)
{ {
// FIXME If the following line is removed, the combo box popup list will not react to mouse clicks. // FIXME If the following line is removed, the combo box popup list will not react to mouse clicks.
// On the other side, with this line the combo box popup cannot be closed by clicking on the combo button on Windows 10. // On the other side, with this line the combo box popup cannot be closed by clicking on the combo button on Windows 10.
// comboCtrl->UseAltPopupWindow(); m_cc_presets_choice->UseAltPopupWindow();
// comboCtrl->EnablePopupAnimation(false);
m_cc_presets_choice->EnablePopupAnimation(false);
m_cc_presets_choice->SetPopupControl(popup); m_cc_presets_choice->SetPopupControl(popup);
popup->SetStringValue(from_u8("Text1")); popup->SetStringValue(from_u8("Text1"));
@ -57,7 +58,7 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle)
{ {
m_cc_presets_choice->SetText(selected); m_cc_presets_choice->SetText(selected);
std::string selected_string = selected.ToUTF8().data(); std::string selected_string = selected.ToUTF8().data();
//! select_preset(selected_string); select_preset(selected_string);
} }
// popup->OnDataViewTreeCtrlSelection(evt); // popup->OnDataViewTreeCtrlSelection(evt);
}); });
@ -2159,8 +2160,14 @@ void Tab::update_tab_presets(wxComboCtrl* ui, bool show_incompatible)
auto preset_name = wxString::FromUTF8((preset.name + (preset.is_dirty ? suffix_modified : "")).c_str()); auto preset_name = wxString::FromUTF8((preset.name + (preset.is_dirty ? suffix_modified : "")).c_str());
auto item = popup->AppendItem(preset.is_system ? root_sys : root_def, preset_name, wxDataViewItem item;
if (preset.is_system || preset.is_default)
item = popup->AppendItem(preset.is_system ? root_sys : root_def, preset_name,
preset.is_compatible ? icon_compatible : icon_incompatible); preset.is_compatible ? icon_compatible : icon_incompatible);
else {
}
cnt_items++; cnt_items++;
if (i == idx_selected){ if (i == idx_selected){
popup->Select(item); popup->Select(item);
@ -2168,7 +2175,7 @@ void Tab::update_tab_presets(wxComboCtrl* ui, bool show_incompatible)
} }
} }
} }
popup->SetItemsCnt(cnt_items); popup->SetItemsCnt(cnt_items+2);
ui->Thaw(); ui->Thaw();
} }