1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile.

Browse Source 
Update painting code with retina support.

Change-Id: Iebdfaaaaf98ed69f4ecb3cef5ca96b4e4ddb09dd
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Morten Johan Sørvig 2012-12-17 11:29:54 +01:00 committed by The Qt Project
parent acbb6f1897
commit 8fa464ffa6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/cocoa/wheelevent/wheelevent.pro
View File

@ -3,5 +3,5 @@ TEMPLATE = app
HEADERS += window.h
SOURCES += window.cpp main.cpp
QT += core gui gui-private core-private
QT += core core-private gui gui-private widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

23
tests/manual/cocoa/wheelevent/window.cpp
View File

@ -80,7 +80,6 @@ void Window::initialize()
setSizeIncrement(QSize(10, 10));
setBaseSize(QSize(640, 480));
setMinimumSize(QSize(240, 160));
setMaximumSize(QSize(800, 600));
}
create();
@ -102,6 +101,12 @@ void Window::mouseMoveEvent(QMouseEvent *event)
{
if (m_lastPos != QPoint(-1, -1)) {
QPainter p(&m_image);
QPen pen;
pen.setCosmetic(true);
pen.setWidth(1);
p.setPen(pen);
p.setRenderHint(QPainter::Antialiasing);
p.drawLine(m_lastPos, event->pos());
m_lastPos = event->pos();
@ -153,13 +158,16 @@ void Window::resizeEvent(QResizeEvent *)
{
QImage old = m_image;
//qDebug() << "Window::resizeEvent" << width << height;
qDebug() << "Window::resizeEvent" << geometry();
int width = qMax(geometry().width(), old.width());
int height = qMax(geometry().height(), old.height());
int width = qMax(geometry().width() * devicePixelRatio(), qreal(old.width()));
int height = qMax(geometry().height() * devicePixelRatio(), qreal(old.height()));
qDebug() << "Window::resizeEvent" << width << height;
if (width > old.width() || height > old.height()) {
m_image = QImage(width, height, QImage::Format_RGB32);
m_image.setDevicePixelRatio(devicePixelRatio());
m_image.fill(colorTable[(m_backgroundColorIndex) % (sizeof(colorTable) / sizeof(colorTable[0]))].rgba());
QPainter p(&m_image);
@ -221,6 +229,12 @@ void Window::render()
// draw grid:
int gridSpace = 80;
QPen pen;
pen.setCosmetic(true);
pen.setWidth(1);
p.setPen(pen);
for (int y = 0; y < geometry().height() + gridSpace; y+= gridSpace) {
int offset = scrollOffset.y() % gridSpace;
//int color = ((y + offset) %255);// + scrollOffset.y()) % 255);
@ -229,6 +243,7 @@ void Window::render()
//p.fillRect(0, y + offset, geometry().width(), gridSpace,QColor(color,0, 0));
}
for (int x = 0; x < geometry().width() + gridSpace; x+= gridSpace) {
p.drawLine(x + scrollOffset.x() % gridSpace, 0, x + scrollOffset.x() % gridSpace, geometry().height());
}