diff options
Diffstat (limited to 'src/other/deviceitem.cpp')
-rw-r--r-- | src/other/deviceitem.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/other/deviceitem.cpp b/src/other/deviceitem.cpp index 58bb8e8..ac43add 100644 --- a/src/other/deviceitem.cpp +++ b/src/other/deviceitem.cpp @@ -35,6 +35,7 @@ #include <QtCore/QSignalTransition> #include <QtCore/QPropertyAnimation> #include <QtGui/QGraphicsSceneMouseEvent> +#include <QtGui/QGraphicsScene> #include <QtGui/QCursor> #include <QtGui/QPainter> @@ -298,8 +299,7 @@ void DeviceItem::updateMenuPositionAndSize() QRect displayRect; if (mLandscape) { displayRect.setRect(0, 0, mDeviceData.resolution.height(), mDeviceData.resolution.width()); - if (!mDeviceData.landscapeMenu.pixmapPath.isNull() - && !mDeviceData.landscapeMenu.pixmapPath.isEmpty()) { + if (mDeviceData.landscapeMenu.pixmap) { mMenu->setPixmap(*mDeviceData.landscapeMenu.pixmap); mAvailableGeometry = mDeviceData.landscapeMenu.availableGeometry; } else { @@ -308,8 +308,7 @@ void DeviceItem::updateMenuPositionAndSize() } } else { displayRect.setRect(0, 0, mDeviceData.resolution.width(), mDeviceData.resolution.height()); - if (!mDeviceData.portraitMenu.pixmapPath.isNull() - && !mDeviceData.portraitMenu.pixmapPath.isEmpty()) { + if (mDeviceData.portraitMenu.pixmap) { mMenu->setPixmap(*mDeviceData.portraitMenu.pixmap); mAvailableGeometry = mDeviceData.portraitMenu.availableGeometry; } else { @@ -317,11 +316,6 @@ void DeviceItem::updateMenuPositionAndSize() mAvailableGeometry = displayRect; } } - //if (mMenu) { - // mAvailableGeometry = mMenu->updateMenus(mLandscape, displayRect); - //} else { - // mAvailableGeometry = displayRect; - //} emit offsetChanged(mAvailableGeometry.topLeft()); } |