mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-11 12:45:05 +01:00
Fix broken label in touch mapping dialog (#6489)
This commit is contained in:
parent
7327c334ca
commit
9dc71e3347
@ -511,7 +511,7 @@ void TouchScreenPreview::mouseMoveEvent(QMouseEvent* event) {
|
|||||||
}
|
}
|
||||||
const auto pos = MapToDeviceCoords(event->x(), event->y());
|
const auto pos = MapToDeviceCoords(event->x(), event->y());
|
||||||
if (pos) {
|
if (pos) {
|
||||||
coord_label->setText(QStringLiteral("X: %1, Y: %2").arg(pos->x(), pos->y()));
|
coord_label->setText(QStringLiteral("X: %1, Y: %2").arg(pos->x()).arg(pos->y()));
|
||||||
} else {
|
} else {
|
||||||
coord_label->clear();
|
coord_label->clear();
|
||||||
}
|
}
|
||||||
@ -572,7 +572,7 @@ bool TouchScreenPreview::eventFilter(QObject* obj, QEvent* event) {
|
|||||||
emit DotMoved(drag_state.dot->property(PropId).toInt(), *device_coord);
|
emit DotMoved(drag_state.dot->property(PropId).toInt(), *device_coord);
|
||||||
if (coord_label) {
|
if (coord_label) {
|
||||||
coord_label->setText(
|
coord_label->setText(
|
||||||
QStringLiteral("X: %1, Y: %2").arg(device_coord->x(), device_coord->y()));
|
QStringLiteral("X: %1, Y: %2").arg(device_coord->x()).arg(device_coord->y()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -114,7 +114,7 @@ void OptionSetDialog::InitializeUI(const std::string& initial_value) {
|
|||||||
ui->formatLabel->text().append(QStringLiteral("\n"));
|
ui->formatLabel->text().append(QStringLiteral("\n"));
|
||||||
}
|
}
|
||||||
ui->formatLabel->setText(
|
ui->formatLabel->setText(
|
||||||
ui->formatLabel->text().append(tr("Range: %1 - %2").arg(option.min, option.max)));
|
ui->formatLabel->text().append(tr("Range: %1 - %2").arg(option.min).arg(option.max)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decide and initialize layout
|
// Decide and initialize layout
|
||||||
|
@ -2248,7 +2248,7 @@ void GMainWindow::UpdateStatusBar() {
|
|||||||
message_label_used_for_movie = true;
|
message_label_used_for_movie = true;
|
||||||
ui->action_Save_Movie->setEnabled(true);
|
ui->action_Save_Movie->setEnabled(true);
|
||||||
} else if (play_mode == Core::Movie::PlayMode::Playing) {
|
} else if (play_mode == Core::Movie::PlayMode::Playing) {
|
||||||
message_label->setText(tr("Playing %1 / %2").arg(current, total));
|
message_label->setText(tr("Playing %1 / %2").arg(current).arg(total));
|
||||||
message_label_used_for_movie = true;
|
message_label_used_for_movie = true;
|
||||||
ui->action_Save_Movie->setEnabled(false);
|
ui->action_Save_Movie->setEnabled(false);
|
||||||
} else if (play_mode == Core::Movie::PlayMode::MovieFinished) {
|
} else if (play_mode == Core::Movie::PlayMode::MovieFinished) {
|
||||||
|
Loading…
Reference in New Issue
Block a user