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

Re-enabled $combochecklist_features->UseAltPopupWindow(), without this

Browse Source 
line the combo box popup was not reacting to mouse events on Windows 10.
This commit is contained in:
bubnikv 2018-02-13 17:46:23 +01:00
parent 030fc9c320
commit 6cf8264362
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Slic3r/GUI/Plater/3DPreview.pm
View File

@ -72,6 +72,9 @@ sub new {
my $combochecklist_features = Wx::ComboCtrl->new();
$combochecklist_features->Create($self, -1, "Feature types", wxDefaultPosition, [200, -1], wxCB_READONLY);
#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.
$combochecklist_features->UseAltPopupWindow();
$combochecklist_features->EnablePopupAnimation(0);
my $feature_text = "Feature types";
my $feature_items = "Perimeter|External perimeter|Overhang perimeter|Internal infill|Solid infill|Top solid infill|Bridge infill|Gap fill|Skirt|Support material|Support material interface|Wipe tower";

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

@ -227,7 +227,7 @@ int combochecklist_get_flags(wxComboCtrl* comboCtrl)
for (unsigned int i = 0; i < popup->GetCount(); ++i)
{
if (popup->IsChecked(i))
flags += (int)std::pow(2.0f, (float)i);
flags |= 1 << i;
}
}