Move the position_screen method to the Screen class
This commit is contained in:
parent
9bd10b3b5e
commit
37d0558873
@ -129,7 +129,7 @@ sub new {
|
|||||||
my ($opt_id, $value) = @_;
|
my ($opt_id, $value) = @_;
|
||||||
|
|
||||||
$self->config2->{$opt_id} = $value;
|
$self->config2->{$opt_id} = $value;
|
||||||
$self->position_screen;
|
$self->screen->reposition;
|
||||||
$self->show_print_time;
|
$self->show_print_time;
|
||||||
|
|
||||||
my $serialized = {};
|
my $serialized = {};
|
||||||
@ -394,7 +394,7 @@ sub new {
|
|||||||
$self->screen(Slic3r::GUI::Projector::Screen->new($parent, $self->config, $self->config2));
|
$self->screen(Slic3r::GUI::Projector::Screen->new($parent, $self->config, $self->config2));
|
||||||
$Slic3r::GUI::DLP_projection_screen = $self->screen;
|
$Slic3r::GUI::DLP_projection_screen = $self->screen;
|
||||||
}
|
}
|
||||||
$self->position_screen;
|
$self->screen->reposition;
|
||||||
$self->screen->Show;
|
$self->screen->Show;
|
||||||
wxTheApp->{mainframe}->Hide;
|
wxTheApp->{mainframe}->Hide;
|
||||||
|
|
||||||
@ -468,19 +468,6 @@ sub show_print_time {
|
|||||||
int($duration/60), ($duration - int($duration/60)*60)); # % truncates to integer
|
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 {
|
sub _close {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
|
|
||||||
@ -766,6 +753,19 @@ sub new {
|
|||||||
return $self;
|
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 {
|
sub _resize {
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user