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

aolayer Debug text bamboozled (#461)

Browse Source 
Set focus to chat on pos remove click
This commit is contained in:
Crystalwarrior 2021-02-11 14:42:37 +03:00 committed by GitHub
parent 617f956f2a
commit 940b04adb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aolayer.cpp
View File

@ -140,7 +140,9 @@ void BackgroundLayer::load_image(QString p_filename)
transform_mode = transform_mode =
ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path)); ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path));
stretch = ao_app->read_design_ini("stretch", design_path).startsWith("true"); stretch = ao_app->read_design_ini("stretch", design_path).startsWith("true");
#ifdef DEBUG_MOVIE
qDebug() << "[BackgroundLayer] BG loaded: " << p_filename; qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
#endif
start_playback(ao_app->get_image_suffix(ao_app->get_background_path(p_filename))); start_playback(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)));
} }
@ -187,9 +189,11 @@ void CharLayer::load_image(QString p_filename, QString p_charname,
play_once = true; play_once = true;
preanim_timer->start(duration * tick_ms); preanim_timer->start(duration * tick_ms);
} }
#ifdef DEBUG_MOVIE
qDebug() << "[CharLayer] anim loaded: prefix " << prefix << " filename " qDebug() << "[CharLayer] anim loaded: prefix " << prefix << " filename "
<< current_emote << " from character: " << p_charname << current_emote << " from character: " << p_charname
<< " continuous: " << continuous; << " continuous: " << continuous;
#endif
QList<QString> pathlist = { QList<QString> pathlist = {
ao_app->get_image_suffix(ao_app->get_character_path( ao_app->get_image_suffix(ao_app->get_character_path(
p_charname, prefix + current_emote)), // Default path p_charname, prefix + current_emote)), // Default path
@ -324,7 +328,9 @@ void AOLayer::start_playback(QString p_image)
if (stretch_override != "") if (stretch_override != "")
stretch = stretch_override.startsWith("true"); stretch = stretch_override.startsWith("true");
#ifdef DEBUG_MOVIE
qDebug() << "stretch:" << stretch << "filename:" << p_image; qDebug() << "stretch:" << stretch << "filename:" << p_image;
#endif
m_reader.setFileName(p_image); m_reader.setFileName(p_image);
if (m_reader.loopCount() == 0) if (m_reader.loopCount() == 0)
play_once = true; play_once = true;
@ -474,8 +480,10 @@ void CharLayer::load_network_effects()
if (effect == "sfx^") // Currently the only frame result that feeds us if (effect == "sfx^") // Currently the only frame result that feeds us
// data, let's yank it in. // data, let's yank it in.
effect += f_data; effect += f_data;
#ifdef DEBUG_MOVIE
qDebug() << effect << f_data << "frame" << f_frame << "for" qDebug() << effect << f_data << "frame" << f_frame << "for"
<< m_emote; << m_emote;
#endif
movie_effects[f_frame].append(effect); movie_effects[f_frame].append(effect);
} }
} }

1
src/courtroom.cpp
View File

@ -4341,6 +4341,7 @@ void Courtroom::on_pos_remove_clicked()
ui_pos_dropdown->setCurrentIndex(0); // as a last resort, choose the first item in the dropdown ui_pos_dropdown->setCurrentIndex(0); // as a last resort, choose the first item in the dropdown
current_side = ""; current_side = "";
ui_pos_remove->hide(); ui_pos_remove->hide();
ui_ic_chat_message->setFocus();
} }
void Courtroom::set_iniswap_dropdown() void Courtroom::set_iniswap_dropdown()