Mercurial > octave

comparison libgui/src/terminal-dock-widget.cc @ 31006:35d37e433532 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace use of depreciated QDesktopWidget in GUI * gui-utils.cc: include QApplication, QRect and QScreen; (get_screen_geometry): return QRect with geometry of primary screen; (adjust_to_screen): adjust given QRect to be completely on the screen that contains the largest part of the QRect, use a default geometry if no part is on an available screen * gui-utils.h: include QRect; new function get_screen_geometry and adjust_to_screen * community-news.cc: do not include QDesktopWidget, but gui-utils.h; (get_screen_geometry); move function to gui-utils.cc; * community-news.h: move get_screen_geometry to gui-utils.h * find-dialog.cc: do not include QDesktopWidget, but gui-utils.h; (restore_settings): use new function adjust_to_screen * main-window.cc: do not include QDesktopWidget, but gui-utils.h; (get_screen_geometry: move function to gui-utils.cc * main-window.h: move function get_screen_geometry to gui.utils.h; * octave-dock-widget.cc: do not include QDesktopWidget, but gui-utils.h QScreen and QWindow; (handle_settings): use adjust_to_screen and QGuiApplication->primaryScreen * release-notes.cc: do not include QDesktopWidget, but gui-utils.h and QScreen; (get_screen_geometry): move to gui-utils.cc; * release-notes.h: move get:screen_geometry to gui-utils.h * terminal-dock-widget.cc: do not include QDesktopWidget but QScreen; (terminal_dock_widget): use QGuiApplication->primaryScreen instead of QDesktopWidget->screenGeometry * welcome-wizard.cc: remove include of QDesktopWidget
author Torsten Lilge <ttl-octave@mailbox.org>
date Sun, 30 Jan 2022 16:41:44 +0100
parents 796f54d4ddbf
children 04601f6c47f4
comparison
equal deleted inserted replaced
31004:2b4f7287aa3a 31006:35d37e433532
25 25
26 #if defined (HAVE_CONFIG_H) 26 #if defined (HAVE_CONFIG_H)
27 # include "config.h" 27 # include "config.h"
28 #endif 28 #endif
29 29
30 #include <QDesktopWidget> 30 #include <QScreen>
31 31
32 // This header is only needed for the new terminal widget. 32 // This header is only needed for the new terminal widget.
33 #include "command-widget.h" 33 #include "command-widget.h"
34 34
35 // This header is only needed for the old terminal widget. 35 // This header is only needed for the old terminal widget.
105 QFontMetrics metrics(font); 105 QFontMetrics metrics(font);
106 106
107 int win_x = metrics.maxWidth()*80; 107 int win_x = metrics.maxWidth()*80;
108 int win_y = metrics.height()*25; 108 int win_y = metrics.height()*25;
109 109
110 int max_x = QApplication::desktop ()->screenGeometry (this).width (); 110 int max_x = QGuiApplication::primaryScreen ()->availableGeometry ().width ();
111 int max_y = QApplication::desktop ()->screenGeometry (this).height (); 111 int max_y = QGuiApplication::primaryScreen ()->availableGeometry ().height ();
112 112
113 if (win_x > max_x) 113 if (win_x > max_x)
114 win_x = max_x; 114 win_x = max_x;
115 if (win_y > max_y) 115 if (win_y > max_y)
116 win_y = max_y; 116 win_y = max_y;