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

When testing for a key press, rather check for the modifier keys

Browse source 
(alt, ctrl) always. Also if a key event is not processed, pass it
for further processing.
This commit is contained in:
bubnikv 2017-06-06 19:14:52 +02:00
parent 53d08d1883
commit dabcff1c07
3 changed files with 50 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Slic3r/GUI/Plater/2DToolpaths.pm
View file

@ -52,6 +52,9 @@ sub new {
}); });
EVT_KEY_DOWN($canvas, sub { EVT_KEY_DOWN($canvas, sub {
my ($s, $event) = @_; my ($s, $event) = @_;
if ($event->HasModifiers) {
$event->Skip;
} else {
my $key = $event->GetKeyCode; my $key = $event->GetKeyCode;
if ($key == ord('D') || $key == WXK_LEFT) { if ($key == ord('D') || $key == WXK_LEFT) {
# Keys: 'D' or WXK_LEFT # Keys: 'D' or WXK_LEFT
@ -64,6 +67,9 @@ sub new {
} elsif ($key >= ord('1') && $key <= ord('3')) { } elsif ($key >= ord('1') && $key <= ord('3')) {
# Keys: '1' to '3' # Keys: '1' to '3'
$canvas->set_simulation_mode($key - ord('1')); $canvas->set_simulation_mode($key - ord('1'));
} else {
$event->Skip;
}
} }
}); });

6
lib/Slic3r/GUI/Plater/3DPreview.pm
View file

@ -89,6 +89,9 @@ sub new {
EVT_KEY_DOWN($canvas, sub { EVT_KEY_DOWN($canvas, sub {
my ($s, $event) = @_; my ($s, $event) = @_;
my $key = $event->GetKeyCode; my $key = $event->GetKeyCode;
if ($event->HasModifiers) {
$event->Skip;
} else {
if ($key == ord('U') || $key == WXK_RIGHT) { if ($key == ord('U') || $key == WXK_RIGHT) {
$slider_high->SetValue($slider_high->GetValue + 1); $slider_high->SetValue($slider_high->GetValue + 1);
$slider_low->SetValue($slider_high->GetValue) if ($event->ShiftDown()); $slider_low->SetValue($slider_high->GetValue) if ($event->ShiftDown());
@ -104,6 +107,9 @@ sub new {
$slider_low->SetValue($slider_high->GetValue); $slider_low->SetValue($slider_high->GetValue);
$self->set_z_idx_high($slider_high->GetValue); $self->set_z_idx_high($slider_high->GetValue);
} }
} else {
$event->Skip;
}
} }
}); });
EVT_CHECKBOX($self, $checkbox_singlelayer, sub { EVT_CHECKBOX($self, $checkbox_singlelayer, sub {

7
lib/Slic3r/GUI/Plater/3DToolpaths.pm
View file

@ -50,7 +50,9 @@ sub new {
}); });
EVT_KEY_DOWN($canvas, sub { EVT_KEY_DOWN($canvas, sub {
my ($s, $event) = @_; my ($s, $event) = @_;
if ($event->HasModifiers) {
$event->Skip;
} else {
my $key = $event->GetKeyCode; my $key = $event->GetKeyCode;
if ($key == 85 || $key == 315) { if ($key == 85 || $key == 315) {
$slider->SetValue($slider->GetValue + 1); $slider->SetValue($slider->GetValue + 1);
@ -58,6 +60,9 @@ sub new {
} elsif ($key == 68 || $key == 317) { } elsif ($key == 68 || $key == 317) {
$slider->SetValue($slider->GetValue - 1); $slider->SetValue($slider->GetValue - 1);
$self->set_z($self->{layers_z}[$slider->GetValue]); $self->set_z($self->{layers_z}[$slider->GetValue]);
} else {
$event->Skip;
}
} }
}); });