From 37d05588733d0b734ea05712f65a8f95271da953 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 11 Dec 2015 01:18:02 +0100 Subject: [PATCH] Move the position_screen method to the Screen class --- lib/Slic3r/GUI/Projector.pm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/Slic3r/GUI/Projector.pm b/lib/Slic3r/GUI/Projector.pm index 51c559a7c7..7a6e6af1bf 100644 --- a/lib/Slic3r/GUI/Projector.pm +++ b/lib/Slic3r/GUI/Projector.pm @@ -129,7 +129,7 @@ sub new { my ($opt_id, $value) = @_; $self->config2->{$opt_id} = $value; - $self->position_screen; + $self->screen->reposition; $self->show_print_time; my $serialized = {}; @@ -394,7 +394,7 @@ sub new { $self->screen(Slic3r::GUI::Projector::Screen->new($parent, $self->config, $self->config2)); $Slic3r::GUI::DLP_projection_screen = $self->screen; } - $self->position_screen; + $self->screen->reposition; $self->screen->Show; wxTheApp->{mainframe}->Hide; @@ -468,19 +468,6 @@ sub show_print_time { int($duration/60), ($duration - int($duration/60)*60)); # % truncates to integer } -sub position_screen { - my ($self) = @_; - - my $display = Wx::Display->new($self->config2->{display}); - my $area = $display->GetGeometry; - $self->screen->Move($area->GetPosition); - # ShowFullScreen doesn't use the right screen - #$self->screen->ShowFullScreen($self->config2->{fullscreen}); - $self->screen->SetSize($area->GetSize); - $self->screen->_resize; - $self->screen->Refresh; -} - sub _close { my $self = shift; @@ -766,6 +753,19 @@ sub new { return $self; } +sub reposition { + my ($self) = @_; + + my $display = Wx::Display->new($self->config2->{display}); + my $area = $display->GetGeometry; + $self->Move($area->GetPosition); + # ShowFullScreen doesn't use the right screen + #$self->ShowFullScreen($self->config2->{fullscreen}); + $self->SetSize($area->GetSize); + $self->_resize; + $self->Refresh; +} + sub _resize { my ($self) = @_;