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

[Bugfix] Fix slides not applying the X offset during slide position calculaiton (#1038)

Browse Source 
* Make slides correctly respect X offset

* Bump to RC4 cause I am cute like that
This commit is contained in:
Salanto 2024-08-24 15:33:49 +02:00 committed by GitHub
parent b7dd8984d7
commit 50204ec2e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aoapplication.cpp
View File

@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()
QString AOApplication::get_version_string() QString AOApplication::get_version_string()
{ {
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC3"; return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC4";
} }
QString AOApplication::find_image(QStringList p_list) QString AOApplication::find_image(QStringList p_list)

5
src/courtroom.cpp
View File

@ -1,5 +1,6 @@
#include "courtroom.h" #include "courtroom.h"
#include "datatypes.h"
#include "moderation_functions.h" #include "moderation_functions.h"
#include "options.h" #include "options.h"
@ -3008,7 +3009,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
auto calculate_offset_and_setup_layer = [&, this](kal::CharacterAnimationLayer *layer, QPoint newPos, QString rawOffset) { auto calculate_offset_and_setup_layer = [&, this](kal::CharacterAnimationLayer *layer, QPoint newPos, QString rawOffset) {
QPoint offset; QPoint offset;
QStringList offset_data = rawOffset.split(","); QStringList offset_data = rawOffset.split("&");
offset.setX(viewport_width * offset_data.at(0).toInt() * 0.01); offset.setX(viewport_width * offset_data.at(0).toInt() * 0.01);
if (offset_data.size() > 1) if (offset_data.size() > 1)
{ {
@ -3019,7 +3020,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
layer->setPlayOnce(false); layer->setPlayOnce(false);
layer->pausePlayback(true); layer->pausePlayback(true);
layer->startPlayback(); layer->startPlayback();
layer->move(newPos); layer->move(newPos + offset);
layer->show(); layer->show();
}; };