author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/imageedit.cpp | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/imageedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/imageedit.cpp b/library/imageedit.cpp index 0c22448..caa538a 100644 --- a/library/imageedit.cpp +++ b/library/imageedit.cpp | |||
@@ -1,71 +1,71 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "imageedit.h" | 20 | #include "imageedit.h" |
21 | #include <qpainter.h> | 21 | #include <qpainter.h> |
22 | 22 | ||
23 | ImageEdit::ImageEdit( QWidget *parent, const char *name ) | 23 | ImageEdit::ImageEdit( QWidget *parent, const char *name) |
24 | : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer() | 24 | : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer() |
25 | { | 25 | { |
26 | buffer.resize( size() ); | 26 | buffer.resize( size() ); |
27 | buffer.fill( colorGroup().color( QColorGroup::Base ) ); | 27 | buffer.fill( colorGroup().color( QColorGroup::Base ) ); |
28 | } | 28 | } |
29 | 29 | ||
30 | ImageEdit::~ImageEdit() | 30 | ImageEdit::~ImageEdit() |
31 | { | 31 | { |
32 | 32 | ||
33 | } | 33 | } |
34 | 34 | ||
35 | void ImageEdit::contentsMousePressEvent( QMouseEvent *e ) | 35 | void ImageEdit::contentsMousePressEvent( QMouseEvent *e ) |
36 | { | 36 | { |
37 | lastPos = e->pos(); | 37 | lastPos = e->pos(); |
38 | } | 38 | } |
39 | 39 | ||
40 | void ImageEdit::contentsMouseMoveEvent( QMouseEvent *e ) | 40 | void ImageEdit::contentsMouseMoveEvent( QMouseEvent *e ) |
41 | { | 41 | { |
42 | QPainter pw( viewport() ); | 42 | QPainter pw( viewport() ); |
43 | QPainter pb( &buffer ); | 43 | QPainter pb( &buffer ); |
44 | pb.drawLine( lastPos, e->pos() ); | 44 | pb.drawLine( lastPos, e->pos() ); |
45 | pw.drawLine( contentsToViewport( lastPos ), | 45 | pw.drawLine( contentsToViewport( lastPos ), |
46 | contentsToViewport( e->pos() ) ); | 46 | contentsToViewport( e->pos() ) ); |
47 | lastPos = e->pos(); | 47 | lastPos = e->pos(); |
48 | } | 48 | } |
49 | 49 | ||
50 | void ImageEdit::contentsMouseReleaseEvent( QMouseEvent * ) | 50 | void ImageEdit::contentsMouseReleaseEvent( QMouseEvent * ) |
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | ||
54 | void ImageEdit::viewportResizeEvent( QResizeEvent *e ) | 54 | void ImageEdit::viewportResizeEvent( QResizeEvent *e ) |
55 | { | 55 | { |
56 | enlargeBuffer(e->size()); | 56 | enlargeBuffer(e->size()); |
57 | } | 57 | } |
58 | 58 | ||
59 | void ImageEdit::enlargeBuffer( const QSize& sz ) | 59 | void ImageEdit::enlargeBuffer( const QSize& sz ) |
60 | { | 60 | { |
61 | QSize osz = buffer.size(); | 61 | QSize osz = buffer.size(); |
62 | QSize nsz( QMAX( osz.width(), sz.width() ), QMAX( osz.height(), sz.height() ) ); | 62 | QSize nsz( QMAX( osz.width(), sz.width() ), QMAX( osz.height(), sz.height() ) ); |
63 | buffer.resize( nsz.width(), nsz.height() ); | 63 | buffer.resize( nsz.width(), nsz.height() ); |
64 | // clear new area | 64 | // clear new area |
65 | QPainter p( &buffer ); | 65 | QPainter p( &buffer ); |
66 | if ( sz.width() > osz.width() ) | 66 | if ( sz.width() > osz.width() ) |
67 | p.fillRect( osz.width(), 0, sz.width() - osz.width(), nsz.height(), colorGroup().color( QColorGroup::Base ) ); | 67 | p.fillRect( osz.width(), 0, sz.width() - osz.width(), nsz.height(), colorGroup().color( QColorGroup::Base ) ); |
68 | if ( sz.height() > osz.height() ) | 68 | if ( sz.height() > osz.height() ) |
69 | p.fillRect( 0, osz.height(), nsz.width(), sz.height() - osz.height(), colorGroup().color( QColorGroup::Base ) ); | 69 | p.fillRect( 0, osz.height(), nsz.width(), sz.height() - osz.height(), colorGroup().color( QColorGroup::Base ) ); |
70 | p.end(); | 70 | p.end(); |
71 | } | 71 | } |