author | leseb <leseb> | 2002-04-10 09:09:18 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-04-10 09:09:18 (UTC) |
commit | ef60c3e367a4ce89367ad6f5c035134bef6602a6 (patch) (unidiff) | |
tree | fe9560f1b3a8c1035808e5010ec6c157bda929c5 | |
parent | 4eb2a1b8698fdcca7a2c74a3fe9a88a297607754 (diff) | |
download | opie-ef60c3e367a4ce89367ad6f5c035134bef6602a6.zip opie-ef60c3e367a4ce89367ad6f5c035134bef6602a6.tar.gz opie-ef60c3e367a4ce89367ad6f5c035134bef6602a6.tar.bz2 |
Fix flickering when using tools
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 3ddd7b7..58192d3 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -140,48 +140,50 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
140 | } | 140 | } |
141 | 141 | ||
142 | QByteArray byteArrayUnzipped(m_dataLenght); | 142 | QByteArray byteArrayUnzipped(m_dataLenght); |
143 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); | 143 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); |
144 | 144 | ||
145 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); | 145 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); |
146 | } else { | 146 | } else { |
147 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); | 147 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); |
148 | } | 148 | } |
149 | 149 | ||
150 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); | 150 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); |
151 | pixmap->convertFromImage(image); | 151 | pixmap->convertFromImage(image); |
152 | m_pixmaps.append(pixmap); | 152 | m_pixmaps.append(pixmap); |
153 | } | 153 | } |
154 | 154 | ||
155 | return true; | 155 | return true; |
156 | } | 156 | } |
157 | 157 | ||
158 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) | 158 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) |
159 | : QScrollView(parent, name) | 159 | : QScrollView(parent, name) |
160 | { | 160 | { |
161 | m_pDrawPad = drawPad; | 161 | m_pDrawPad = drawPad; |
162 | m_pages.setAutoDelete(true); | 162 | m_pages.setAutoDelete(true); |
163 | m_pageBackups.setAutoDelete(true); | 163 | m_pageBackups.setAutoDelete(true); |
164 | |||
165 | viewport()->setBackgroundMode(QWidget::NoBackground); | ||
164 | } | 166 | } |
165 | 167 | ||
166 | DrawPadCanvas::~DrawPadCanvas() | 168 | DrawPadCanvas::~DrawPadCanvas() |
167 | { | 169 | { |
168 | } | 170 | } |
169 | 171 | ||
170 | void DrawPadCanvas::load(QIODevice* ioDevice) | 172 | void DrawPadCanvas::load(QIODevice* ioDevice) |
171 | { | 173 | { |
172 | QTextStream textStream(ioDevice); | 174 | QTextStream textStream(ioDevice); |
173 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 175 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
174 | 176 | ||
175 | QXmlInputSource xmlInputSource(textStream); | 177 | QXmlInputSource xmlInputSource(textStream); |
176 | QXmlSimpleReader xmlSimpleReader; | 178 | QXmlSimpleReader xmlSimpleReader; |
177 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; | 179 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; |
178 | 180 | ||
179 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); | 181 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); |
180 | xmlSimpleReader.parse(xmlInputSource); | 182 | xmlSimpleReader.parse(xmlInputSource); |
181 | 183 | ||
182 | m_pages = drawPadCanvasXmlHandler.pixmaps(); | 184 | m_pages = drawPadCanvasXmlHandler.pixmaps(); |
183 | 185 | ||
184 | if (m_pages.isEmpty()) { | 186 | if (m_pages.isEmpty()) { |
185 | m_pages.append(new QPixmap(contentsRect().size())); | 187 | m_pages.append(new QPixmap(contentsRect().size())); |
186 | m_pages.current()->fill(Qt::white); | 188 | m_pages.current()->fill(Qt::white); |
187 | } | 189 | } |