diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2014-02-07 21:38:06 -0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-02-08 07:22:42 -0800 |
commit | 39a11d70923940f45b5e1493dabfa934ec2a79c6 (patch) | |
tree | 0bf4b84e8f512e043c5c28eb820c88303cf87963 | |
parent | cacf5b3b2479220f4aa56879928ffe23a4277a7f (diff) | |
download | subsurface-39a11d70923940f45b5e1493dabfa934ec2a79c6.tar.gz |
Fix placement of notification area and dive computer name.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | qt-ui/profile/diveprofileitem.cpp | 2 | ||||
-rw-r--r-- | qt-ui/profile/profilewidget2.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
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<dive*> 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)); } } |