Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #770 from AttorneyOnline/fix-stickers

Browse Source 
Fix stickers being layered under the chatbox rather than above
This commit is contained in:
oldmud0 2022-06-03 22:27:30 -05:00 committed by GitHub
commit e4125d3f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/courtroom.cpp
View File

@ -70,6 +70,13 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_vp_chatbox = new AOImage(this, ao_app); ui_vp_chatbox = new AOImage(this, ao_app);
ui_vp_chatbox->setObjectName("ui_vp_chatbox"); ui_vp_chatbox->setObjectName("ui_vp_chatbox");
ui_vp_sticker = new StickerLayer(this, ao_app);
ui_vp_sticker->set_play_once(false);
ui_vp_sticker->set_cull_image(false);
ui_vp_sticker->setAttribute(Qt::WA_TransparentForMouseEvents);
ui_vp_sticker->setObjectName("ui_vp_sticker");
ui_vp_showname = new QLabel(ui_vp_chatbox); ui_vp_showname = new QLabel(ui_vp_chatbox);
ui_vp_showname->setObjectName("ui_vp_showname"); ui_vp_showname->setObjectName("ui_vp_showname");
ui_vp_showname->setAlignment(Qt::AlignLeft); ui_vp_showname->setAlignment(Qt::AlignLeft);
@ -179,11 +186,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_ic_chat_message->installEventFilter(ui_ic_chat_message_filter); ui_ic_chat_message->installEventFilter(ui_ic_chat_message_filter);
ui_ic_chat_message->setObjectName("ui_ic_chat_message"); ui_ic_chat_message->setObjectName("ui_ic_chat_message");
ui_vp_sticker = new StickerLayer(ui_viewport, ao_app);
ui_vp_sticker->set_play_once(false);
ui_vp_sticker->setAttribute(Qt::WA_TransparentForMouseEvents);
ui_vp_sticker->setObjectName("ui_vp_sticker");
ui_muted = new AOImage(ui_ic_chat_message, ao_app); ui_muted = new AOImage(ui_ic_chat_message, ao_app);
ui_muted->hide(); ui_muted->hide();
ui_muted->setObjectName("ui_muted"); ui_muted->setObjectName("ui_muted");
@ -831,7 +833,7 @@ void Courtroom::set_widgets()
ui_vp_message->y() + ui_vp_chatbox->y()); ui_vp_message->y() + ui_vp_chatbox->y());
ui_vp_message->setTextInteractionFlags(Qt::NoTextInteraction); ui_vp_message->setTextInteractionFlags(Qt::NoTextInteraction);
ui_vp_sticker->move(0, 0); ui_vp_sticker->move(ui_viewport->x(), ui_viewport->y());
ui_vp_sticker->combo_resize(ui_viewport->width(), ui_vp_sticker->combo_resize(ui_viewport->width(),
ui_viewport->height()); ui_viewport->height());