aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorin1tiate <32779090+in1tiate@users.noreply.github.com>2021-04-19 19:27:25 -0500
committerGitHub <noreply@github.com>2021-04-20 03:27:25 +0300
commite517a365d59a46f213e5f053404ecb1904f63ab6 (patch)
treeac377fff8727c12519fc18f7354f0619d5a7096c
parent8f0913d30e5ed1cd6a9ee5f7f8b82d68f7630395 (diff)
don't set a mask on elements affected by offsets (#524)
-rw-r--r--include/aolayer.h1
-rw-r--r--src/aolayer.cpp7
-rw-r--r--src/courtroom.cpp2
3 files changed, 7 insertions, 3 deletions
diff --git a/include/aolayer.h b/include/aolayer.h
index 1984b77e..f42642cd 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -52,6 +52,7 @@ public:
bool force_continuous = false;
Qt::TransformationMode transform_mode = Qt::FastTransformation; // transformation mode to use for this image
bool stretch = false; // Should we stretch/squash this image to fill the screen?
+ bool masked = true; // Set a mask to the dimensions of the widget?
// Set the movie's image to provided paths, preparing for playback.
void start_playback(QString p_image);
diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 18213ce1..e4db75ad 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -98,9 +98,10 @@ void AOLayer::center_pixmap(QPixmap f_pixmap) {
x + (f_w - f_pixmap.width()) / 2,
y + (f_h - f_pixmap.height())); // Always center horizontally, always put
// at the bottom vertically
- this->setMask(
- QRegion((f_pixmap.width() - f_w) / 2, (f_pixmap.height() - f_h) / 2, f_w,
- f_h)); // make sure we don't escape the area we've been given
+ if (masked)
+ this->setMask(
+ QRegion((f_pixmap.width() - f_w) / 2, (f_pixmap.height() - f_h) / 2, f_w,
+ f_h)); // make sure we don't escape the area we've been given
}
void AOLayer::combo_resize(int w, int h)
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 8ffd2b5c..aafc16d0 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -46,7 +46,9 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_vp_background = new BackgroundLayer(ui_viewport, ao_app);
ui_vp_speedlines = new SplashLayer(ui_viewport, ao_app);
ui_vp_player_char = new CharLayer(ui_viewport, ao_app);
+ ui_vp_player_char->masked = false;
ui_vp_sideplayer_char = new CharLayer(ui_viewport, ao_app);
+ ui_vp_sideplayer_char->masked = false;
ui_vp_sideplayer_char->hide();
ui_vp_desk = new BackgroundLayer(ui_viewport, ao_app);