From b0cb4bcef331c49bcba9a847690642c719cb7545 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Wed, 11 Jun 2014 14:26:05 -0700 Subject: [PATCH] The Primary Flight Display widget is now properly resizable. --- src/ui/MainWindow.cc | 6 +++--- src/ui/PrimaryFlightDisplay.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index c96e98334..9e37f9b9f 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -677,10 +677,10 @@ void MainWindow::buildCommonWidgets() menuActionHelper->createToolAction(tr("Actuator Status"), "HEAD_DOWN_DISPLAY_2_DOCKWIDGET"); menuActionHelper->createToolAction(tr("Radio Control")); - createDockWidget(engineeringView,new HUD(320,240,this),tr("Video Downlink"),"HEAD_UP_DISPLAY_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea,QSize(this->width()/1.5,0)); + createDockWidget(engineeringView,new HUD(320,240,this),tr("Video Downlink"),"HEAD_UP_DISPLAY_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea); - createDockWidget(simView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea,QSize(this->width()/1.5,0)); - createDockWidget(pilotView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea,QSize(this->width()/1.8,0)); + createDockWidget(simView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); + createDockWidget(pilotView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea); QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this); infoview->addSource(mavlinkDecoder); diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc index c22fbf30e..9f6c43ac9 100644 --- a/src/ui/PrimaryFlightDisplay.cc +++ b/src/ui/PrimaryFlightDisplay.cc @@ -170,12 +170,12 @@ PrimaryFlightDisplay::~PrimaryFlightDisplay() refreshTimer->stop(); } - QSize PrimaryFlightDisplay::sizeHint() const { - return QSize(width(), (width()*3.0f)/4); + return QSize(width(), (int)(width() * 3.0f / 4.0f)); } + void PrimaryFlightDisplay::showEvent(QShowEvent* event) { // React only to internal (pre-display) -- 2.22.0