fixed the tiny desk issue, ready for 2.3.2
This commit is contained in:
parent
244339645d
commit
8c34754fb8
@ -13,7 +13,7 @@ RC_ICONS = logo.ico
|
||||
TARGET = Attorney_Online_remake
|
||||
TEMPLATE = app
|
||||
|
||||
VERSION = 2.3.1.0
|
||||
VERSION = 2.3.2.0
|
||||
|
||||
SOURCES += main.cpp\
|
||||
lobby.cpp \
|
||||
|
@ -135,7 +135,7 @@ public:
|
||||
private:
|
||||
const int RELEASE = 2;
|
||||
const int MAJOR_VERSION = 3;
|
||||
const int MINOR_VERSION = 1;
|
||||
const int MINOR_VERSION = 2;
|
||||
|
||||
QString user_theme = "default";
|
||||
|
||||
|
@ -764,7 +764,6 @@ void Courtroom::on_chat_return_pressed()
|
||||
QString f_side = ao_app->get_char_side(current_char);
|
||||
|
||||
QString f_desk_mod = QString::number(ao_app->get_desk_mod(current_char, current_emote));
|
||||
qDebug() << "f_desk_mod: " << f_desk_mod;
|
||||
if (f_desk_mod == "-1")
|
||||
f_desk_mod = "chat";
|
||||
|
||||
@ -1309,8 +1308,9 @@ void Courtroom::set_scene()
|
||||
}
|
||||
|
||||
ui_vp_background->set_image(f_background);
|
||||
qDebug() << "f_desk_image: " << f_desk_image;
|
||||
ui_vp_desk->set_image(f_desk_image);
|
||||
ui_vp_legacy_desk->set_image(f_desk_image);
|
||||
ui_vp_legacy_desk->set_legacy_desk(f_desk_image);
|
||||
|
||||
if (f_desk_mod == "0" || (f_desk_mod != "1" &&
|
||||
(f_side == "jud" ||
|
||||
@ -1329,8 +1329,17 @@ void Courtroom::set_scene()
|
||||
}
|
||||
else
|
||||
{
|
||||
ui_vp_desk->hide();
|
||||
ui_vp_legacy_desk->show();
|
||||
qDebug() << "last";
|
||||
if (f_side == "wit")
|
||||
{
|
||||
ui_vp_desk->show();
|
||||
ui_vp_legacy_desk->hide();
|
||||
}
|
||||
else
|
||||
{
|
||||
ui_vp_desk->hide();
|
||||
ui_vp_legacy_desk->show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user