Mercurial > octave
diff libgui/src/main-window.cc @ 31006:35d37e433532 stable
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 | 96f018336be9 |
children | a0c8c28c38cb |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Mon May 16 23:00:27 2022 +0200 +++ b/libgui/src/main-window.cc Sun Jan 30 16:41:44 2022 +0100 @@ -35,7 +35,6 @@ #include <QDateTime> #include <QDebug> #include <QDesktopServices> -#include <QDesktopWidget> #include <QFileDialog> #include <QIcon> #include <QInputDialog> @@ -69,6 +68,7 @@ #include "gui-preferences-nr.h" #include "gui-preferences-sc.h" #include "gui-settings.h" +#include "gui-utils.h" #include "interpreter-qobject.h" #include "main-window.h" #include "news-reader.h" @@ -2729,15 +2729,6 @@ }); } - // Get size of screen where the main window is located - void main_window::get_screen_geometry (int& width, int& height) - { - QRect screen_geometry = QApplication::desktop ()->availableGeometry (this); - - width = screen_geometry.width (); - height = screen_geometry.height (); - } - void main_window::resize_dock (QDockWidget *dw, int width, int height) { #if defined (HAVE_QMAINWINDOW_RESIZEDOCKS)