Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Feature #910441 » 0029-Qt-Replace-QApplication-desktop-screenGeometry-with-.patch

S2_6 - Marko Lindqvist, 2020-12-27 09:39 PM

View differences:

client/gui-qt/citydlg.cpp
27 27
#include <QPainter>
28 28
#include <QRadioButton>
29 29
#include <QRect>
30
#include <QScreen>
30 31
#include <QScrollArea>
31 32
#include <QScrollBar>
32 33
#include <QSplitter>
......
2189 2190
    central_left_splitter->restoreState(gui()->qt_settings.city_splitter2);
2190 2191
    central_splitter->restoreState(gui()->qt_settings.city_splitter3);
2191 2192
  } else {
2192
    QRect rect = QApplication::desktop()->screenGeometry();
2193
    QRect rect = QApplication::primaryScreen()->geometry();
2193 2194
    resize((rect.width() * 4) / 5, (rect.height() * 5) / 6);
2194 2195
  }
2195 2196
}
client/gui-qt/helpdlg.cpp
1
/********************************************************************** 
1
/***********************************************************************
2 2
 Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
3 3
   This program is free software; you can redistribute it and/or modify
4 4
   it under the terms of the GNU General Public License as published by
......
17 17

  
18 18
// Qt
19 19
#include <QApplication>
20
#include <QDesktopWidget>
21 20
#include <QGraphicsDropShadowEffect>
22 21
#include <QGroupBox>
23 22
#include <QProgressBar>
24 23
#include <QPushButton>
24
#include <QScreen>
25 25
#include <QScrollArea>
26 26
#include <QSplitter>
27 27
#include <QStack>
......
204 204
    restoreGeometry(gui()->qt_settings.help_geometry);
205 205
    splitter->restoreState(gui()->qt_settings.help_splitter1);
206 206
  } else {
207
    QRect rect = QApplication::desktop()->screenGeometry();
207
    QRect rect = QApplication::primaryScreen()->geometry();
208 208

  
209 209
    resize((rect.width() * 3) / 5, (rect.height() * 3) / 6);
210 210
    sizes << rect.width() / 10 << rect.width() / 3;
client/gui-qt/ratesdlg.cpp
17 17

  
18 18
// Qt
19 19
#include <QApplication>
20
#include <QDesktopWidget>
21 20
#include <QGroupBox>
22 21
#include <QMouseEvent>
23 22
#include <QPainter>
23
#include <QScreen>
24 24
#include <QVBoxLayout>
25 25

  
26 26
// common
......
249 249
  QRect rect;
250 250

  
251 251
  p = QCursor::pos();
252
  rect = QApplication::desktop()->availableGeometry();
252
  rect = QApplication::primaryScreen()->availableGeometry();
253 253
  tax_rates_dialog *trd = new tax_rates_dialog(gui()->central_wdg);
254 254
  p.setY(p.y() - trd->height() / 2);
255 255
  if (p.y() < 50) {
256
- 
(2-2/2)