Skip to content

Commit 940b04a

Browse files
aolayer Debug text bamboozled (#461)
Set focus to chat on pos remove click
1 parent 617f956 commit 940b04a

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/aolayer.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ void BackgroundLayer::load_image(QString p_filename)
140140
transform_mode =
141141
ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path));
142142
stretch = ao_app->read_design_ini("stretch", design_path).startsWith("true");
143+
#ifdef DEBUG_MOVIE
143144
qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
145+
#endif
144146
start_playback(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)));
145147
}
146148

@@ -187,9 +189,11 @@ void CharLayer::load_image(QString p_filename, QString p_charname,
187189
play_once = true;
188190
preanim_timer->start(duration * tick_ms);
189191
}
192+
#ifdef DEBUG_MOVIE
190193
qDebug() << "[CharLayer] anim loaded: prefix " << prefix << " filename "
191194
<< current_emote << " from character: " << p_charname
192195
<< " continuous: " << continuous;
196+
#endif
193197
QList<QString> pathlist = {
194198
ao_app->get_image_suffix(ao_app->get_character_path(
195199
p_charname, prefix + current_emote)), // Default path
@@ -324,7 +328,9 @@ void AOLayer::start_playback(QString p_image)
324328
if (stretch_override != "")
325329
stretch = stretch_override.startsWith("true");
326330

331+
#ifdef DEBUG_MOVIE
327332
qDebug() << "stretch:" << stretch << "filename:" << p_image;
333+
#endif
328334
m_reader.setFileName(p_image);
329335
if (m_reader.loopCount() == 0)
330336
play_once = true;
@@ -474,8 +480,10 @@ void CharLayer::load_network_effects()
474480
if (effect == "sfx^") // Currently the only frame result that feeds us
475481
// data, let's yank it in.
476482
effect += f_data;
483+
#ifdef DEBUG_MOVIE
477484
qDebug() << effect << f_data << "frame" << f_frame << "for"
478485
<< m_emote;
486+
#endif
479487
movie_effects[f_frame].append(effect);
480488
}
481489
}

src/courtroom.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4341,6 +4341,7 @@ void Courtroom::on_pos_remove_clicked()
43414341
ui_pos_dropdown->setCurrentIndex(0); // as a last resort, choose the first item in the dropdown
43424342
current_side = "";
43434343
ui_pos_remove->hide();
4344+
ui_ic_chat_message->setFocus();
43444345
}
43454346

43464347
void Courtroom::set_iniswap_dropdown()

0 commit comments

Comments
 (0)