From 39a11d70923940f45b5e1493dabfa934ec2a79c6 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 7 Feb 2014 21:38:06 -0200 Subject: Fix placement of notification area and dive computer name. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/profile/diveprofileitem.cpp | 2 +- qt-ui/profile/profilewidget2.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'qt-ui/profile') diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp index 9aa204808..f60437ee3 100644 --- a/qt-ui/profile/diveprofileitem.cpp +++ b/qt-ui/profile/diveprofileitem.cpp @@ -262,7 +262,7 @@ void DiveTemperatureItem::createTextItem(int sec, int mkelvin) deg = get_temp_units(mkelvin, &unit); DiveTextItem *text = new DiveTextItem(this); - text->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + text->setAlignment(Qt::AlignRight | Qt::AlignBottom); text->setBrush(getColor(TEMP_TEXT)); text->setPos(QPointF(hAxis->posAtValue(sec), vAxis->posAtValue(mkelvin))); text->setText(QString("%1%2").arg(deg, 0, 'f', 1).arg(unit)); diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index d64da9964..76c560fa6 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -146,7 +146,7 @@ void ProfileWidget2::setupItemOnScene() cartesianPlane->setBottomAxis(timeAxis); cartesianPlane->setLeftAxis(profileYAxis); - diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop); + diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignBottom); diveComputerText->setBrush(getColor(TIME_TEXT)); setupItem(reportedCeiling, timeAxis, profileYAxis, dataModel, DivePlotDataModel::CEILING, DivePlotDataModel::TIME, 1); @@ -345,7 +345,6 @@ void ProfileWidget2::plotDives(QList dives) } diveComputerText->setText(currentdc->model); - diveComputerText->animateMoveTo(1 , sceneRect().height()); } void ProfileWidget2::settingsChanged() @@ -411,8 +410,8 @@ void ProfileWidget2::mouseMoveEvent(QMouseEvent* event) if (zoomLevel == 0) { QGraphicsView::mouseMoveEvent(event); } else { - toolTipItem->setPos(mapToScene(toolTipPos)); scrollViewTo(event->pos()); + toolTipItem->setPos(mapToScene(toolTipPos)); } } -- cgit v1.2.3-70-g09d2