aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-11-10 08:56:45 -0600
committerGitHub <noreply@github.com>2020-11-10 08:56:45 -0600
commitfe3b16829fc51e04e284436788db57e96bdded24 (patch)
tree0c74b9d7980ad2b3e78713112944cd030de937ac /src
parentfe3224d7e8ebc81e5389e46f38f2e1120a78f9b8 (diff)
parent2dbedf516391c8f432bfc5a2d2749ba054a78e06 (diff)
Merge pull request #335 from AttorneyOnline/white_space
* set no maximize flag on lobby * set no maximize flag on courtroom * set no maximize flag on charselect * stop them from dragging the charselect * stop them from dragging the courtroom * stop them from dragging the lobby Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/charselect.cpp6
-rw-r--r--src/courtroom.cpp7
-rw-r--r--src/lobby.cpp5
3 files changed, 12 insertions, 6 deletions
diff --git a/src/charselect.cpp b/src/charselect.cpp
index 8e0aab5e..b5439340 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -7,6 +7,8 @@
void Courtroom::construct_char_select()
{
+ this->setWindowFlags( (this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint);
+
ui_char_select_background = new AOImage(this, ao_app);
ui_char_buttons = new QWidget(ui_char_select_background);
@@ -72,10 +74,10 @@ void Courtroom::set_char_select()
if (f_charselect.width < 0 || f_charselect.height < 0) {
qDebug() << "W: did not find char_select width or height in "
"courtroom_design.ini!";
- this->resize(714, 668);
+ this->setFixedSize(714, 668);
}
else
- this->resize(f_charselect.width, f_charselect.height);
+ this->setFixedSize(f_charselect.width, f_charselect.height);
ui_char_select_background->resize(f_charselect.width, f_charselect.height);
ui_char_select_background->set_image("charselect_background");
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 74e9cde7..96e2a533 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -3,6 +3,9 @@
Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
{
ao_app = p_ao_app;
+
+ this->setWindowFlags( (this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint);
+
ao_app->initBASS();
qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch() / 1000));
@@ -451,13 +454,13 @@ void Courtroom::set_widgets()
if (f_courtroom.width < 0 || f_courtroom.height < 0) {
qDebug() << "W: did not find courtroom width or height in " << filename;
- this->resize(714, 668);
+ this->setFixedSize(714, 668);
}
else {
m_courtroom_width = f_courtroom.width;
m_courtroom_height = f_courtroom.height;
- this->resize(f_courtroom.width, f_courtroom.height);
+ this->setFixedSize(f_courtroom.width, f_courtroom.height);
}
set_fonts();
diff --git a/src/lobby.cpp b/src/lobby.cpp
index eaa73ce3..79a565a8 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -13,6 +13,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
this->setWindowTitle(tr("Attorney Online 2"));
this->setWindowIcon(QIcon(":/logo.png"));
+ this->setWindowFlags( (this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint);
ui_background = new AOImage(this, ao_app);
ui_public_servers = new AOButton(this, ao_app);
@@ -97,10 +98,10 @@ void Lobby::set_widgets()
"Did you download all resources correctly from tiny.cc/getao, "
"including the large 'base' folder?"));
- this->resize(517, 666);
+ this->setFixedSize(517, 666);
}
else {
- this->resize(f_lobby.width, f_lobby.height);
+ this->setFixedSize(f_lobby.width, f_lobby.height);
}
set_size_and_pos(ui_background, "lobby");