Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Salanto merged 2 commits into from
Aug 24, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ffd07
Make slides correctly respect X offset
Salanto Aug 24, 2024
9d7ce39
Bump to RC4 cause I am cute like that
Salanto Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aoapplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()

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)
Expand Down
5 changes: 3 additions & 2 deletions src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "courtroom.h"

#include "datatypes.h"
#include "moderation_functions.h"
#include "options.h"

Expand Down Expand Up @@ -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) {
QPoint offset;
QStringList offset_data = rawOffset.split(",");
QStringList offset_data = rawOffset.split("&");
offset.setX(viewport_width * offset_data.at(0).toInt() * 0.01);
if (offset_data.size() > 1)
{
Expand All @@ -3019,7 +3020,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
layer->setPlayOnce(false);
layer->pausePlayback(true);
layer->startPlayback();
layer->move(newPos);
layer->move(newPos + offset);
layer->show();
};

Expand Down