From b5d249f9538bf3dc44f11879c2244deb5a37bf97 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 8 Oct 2018 12:19:01 -0700 Subject: Update the floppy disk icon (save) to be physically correct [ChangeLog][Documentation] Fixed the icons for the "file save" action that were inaccurate representations of a 3.5-inch floppy disk (the cut edge was on the wrong side). Now all floppy representations are physically accurate. Change-Id: Ia3b27ae12a1a4fefa3b7fffd155bb86fee5271c3 Fixes: QTBUG-71012 Reviewed-by: Lars Knoll Reviewed-by: Thiago Macieira --- .../widgets/mainwindows/application/images/save.png | Bin 1187 -> 2699 bytes examples/widgets/mainwindows/mdi/images/save.png | Bin 1187 -> 2699 bytes examples/widgets/mainwindows/sdi/images/save.png | Bin 1187 -> 2699 bytes .../richtext/textedit/images/mac/exportpdf.png | Bin 1215 -> 12637 bytes .../richtext/textedit/images/mac/filesave.png | Bin 1206 -> 2699 bytes .../richtext/textedit/images/win/exportpdf.png | Bin 1059 -> 1215 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/widgets/mainwindows/application/images/save.png b/examples/widgets/mainwindows/application/images/save.png index daba865faf..e65a29d5f1 100644 Binary files a/examples/widgets/mainwindows/application/images/save.png and b/examples/widgets/mainwindows/application/images/save.png differ diff --git a/examples/widgets/mainwindows/mdi/images/save.png b/examples/widgets/mainwindows/mdi/images/save.png index daba865faf..e65a29d5f1 100644 Binary files a/examples/widgets/mainwindows/mdi/images/save.png and b/examples/widgets/mainwindows/mdi/images/save.png differ diff --git a/examples/widgets/mainwindows/sdi/images/save.png b/examples/widgets/mainwindows/sdi/images/save.png index daba865faf..e65a29d5f1 100644 Binary files a/examples/widgets/mainwindows/sdi/images/save.png and b/examples/widgets/mainwindows/sdi/images/save.png differ diff --git a/examples/widgets/richtext/textedit/images/mac/exportpdf.png b/examples/widgets/richtext/textedit/images/mac/exportpdf.png index ebb44e6b88..9e199407af 100644 Binary files a/examples/widgets/richtext/textedit/images/mac/exportpdf.png and b/examples/widgets/richtext/textedit/images/mac/exportpdf.png differ diff --git a/examples/widgets/richtext/textedit/images/mac/filesave.png b/examples/widgets/richtext/textedit/images/mac/filesave.png index b41ecf5319..e65a29d5f1 100644 Binary files a/examples/widgets/richtext/textedit/images/mac/filesave.png and b/examples/widgets/richtext/textedit/images/mac/filesave.png differ diff --git a/examples/widgets/richtext/textedit/images/win/exportpdf.png b/examples/widgets/richtext/textedit/images/win/exportpdf.png index eef5132928..ebb44e6b88 100644 Binary files a/examples/widgets/richtext/textedit/images/win/exportpdf.png and b/examples/widgets/richtext/textedit/images/win/exportpdf.png differ -- cgit v1.2.3 From 6d255b467becad5b5ffebbfa1d13e16b2dd20a64 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 1 Nov 2018 15:05:29 +0100 Subject: Fix composition example during OpenGL resizes Previous images were sometimes not cleared correctly. Change-Id: I62949b756bf797aa79c5160774f2f258e5c353dd Reviewed-by: Friedemann Kleint Reviewed-by: Laszlo Agocs --- examples/widgets/painting/composition/composition.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/widgets/painting/composition/composition.cpp b/examples/widgets/painting/composition/composition.cpp index 3bc31b1fce..e0abc5875c 100644 --- a/examples/widgets/painting/composition/composition.cpp +++ b/examples/widgets/painting/composition/composition.cpp @@ -358,10 +358,10 @@ void CompositionRenderer::paint(QPainter *painter) m_blitter.create(); int new_pbuf_size = m_pbuffer_size; - if (size().width() > m_pbuffer_size || size().height() > m_pbuffer_size) + while (size().width() > new_pbuf_size || size().height() > new_pbuf_size) new_pbuf_size *= 2; - if (size().width() < m_pbuffer_size/2 && size().height() < m_pbuffer_size/2) + while (size().width() < new_pbuf_size/2 && size().height() < new_pbuf_size/2) new_pbuf_size /= 2; if (!m_fbo || new_pbuf_size != m_pbuffer_size) { @@ -372,6 +372,9 @@ void CompositionRenderer::paint(QPainter *painter) if (size() != m_previous_size) { m_previous_size = size(); QPainter p(m_fbo.data()); + p.setCompositionMode(QPainter::CompositionMode_Source); + p.fillRect(QRect(QPoint(0, 0), size()), Qt::transparent); + p.setCompositionMode(QPainter::CompositionMode_SourceOver); drawBase(p); p.end(); m_base_tex = m_fbo->takeTexture(); -- cgit v1.2.3