AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNX: Implement the QPlatformScreen::orientation() function

Browse Source 
Also removed some invalid TODO comments.

Change-Id: I470a9a6538ce10a3a14df14faa641d7be7f18a74
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Sean Harmer 2012-05-21 11:19:14 +01:00 committed by Qt by Nokia
parent 39c5bad574
commit 9be17aa468
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/qnx/qqnxscreen.cpp
View File

@ -65,7 +65,6 @@ QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display,
qDebug() << Q_FUNC_INFO;
#endif
// Cache initial orientation of this display
// TODO: use ORIENTATION environment variable?
errno = 0;
int result = screen_get_display_property_iv(m_display, SCREEN_PROPERTY_ROTATION, &m_initialRotation);
if (result != 0) {
@ -74,7 +73,6 @@ QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display,
m_currentRotation = m_initialRotation;
// Cache size of this display in pixels
// TODO: use WIDTH and HEIGHT environment variables?
errno = 0;
int val[2];
result = screen_get_display_property_iv(m_display, SCREEN_PROPERTY_SIZE, val);
@ -137,6 +135,23 @@ int QQnxScreen::depth() const
return defaultDepth();
}
Qt::ScreenOrientation QQnxScreen::orientation() const
{
Qt::ScreenOrientation orient;
if (m_currentRotation == 0)
orient = Qt::LandscapeOrientation;
else if (m_currentRotation == 90)
orient = Qt::PortraitOrientation;
else if (m_currentRotation == 180)
orient = Qt::InvertedLandscapeOrientation;
else
orient = Qt::InvertedPortraitOrientation;
#if defined(QQNXSCREEN_DEBUG)
qDebug() << Q_FUNC_INFO << "orientation =" << orient;
#endif
return orient;
}
/*!
Check if the supplied angles are perpendicular to each other.
*/

2
src/plugins/platforms/qnx/qqnxscreen.h
View File

@ -68,6 +68,8 @@ public:
QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
QSizeF physicalSize() const { return m_currentPhysicalSize; }
Qt::ScreenOrientation orientation() const;
bool isPrimaryScreen() const { return m_primaryScreen; }
int rotation() const { return m_currentRotation; }