summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-12-19 07:56:15 +0000
committerTim E. Real <termtech@rogers.com>2010-12-19 07:56:15 +0000
commitd393b6b9bbfeb4b31956a6c83302c4cee7856313 (patch)
tree2c46b71aabf3133cd876f899d523aea9c494d423
parentcec04808207cf8fae367c4dc07ab672691db2e60 (diff)
Fixed arranger part drawing borders. Used QPen::setCosmetic(true) when drawing.
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/arranger/pcanvas.cpp10
-rw-r--r--muse2/muse/gconfig.cpp2
-rw-r--r--muse2/muse/widgets/musewidgetsplug.cpp2
4 files changed, 11 insertions, 4 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 932ab02f..7e84d5a5 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -3,6 +3,7 @@
*Feature: Added 'global opaqueness' (transparency) appearance setting. (Tim)
Currently only affects part colours.
TODO: Fix the darn black rectangle drawing. Apply the opaqueness to some other things.
+ - Fixed arranger part drawing borders. Used QPen::setCosmetic(true) when drawing. (Tim)
18.12.2010:
- Fixed transport shortcuts not working in some windows or situations. (Tim)
Added event->ignore to PartCanvas::keyPress. Added setFocusPolicy() to WaveView, Master.
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index d2dda050..5b914952 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1451,13 +1451,19 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
else if (part->selected()) {
bool clone = part->events()->arefCount() > 1;
//p.setPen(config.partColors[i]);
- p.setPen(QPen(config.partColors[i], 2, clone ? Qt::DashLine : Qt::SolidLine));
+ //p.setPen(QPen(config.partColors[i], 2, clone ? Qt::DashLine : Qt::SolidLine));
+ QPen pen(config.partColors[i], 2, clone ? Qt::DashLine : Qt::SolidLine);
+ pen.setCosmetic(true);
+ p.setPen(pen);
p.setBrush(Qt::black);
p.drawRect(r);
}
else {
bool clone = part->events()->arefCount() > 1;
- p.setPen(QPen(Qt::black, 2, clone ? Qt::DashLine : Qt::SolidLine));
+ //p.setPen(QPen(Qt::black, 0, clone ? Qt::DashLine : Qt::SolidLine));
+ QPen pen(Qt::black, 2, clone ? Qt::DashLine : Qt::SolidLine);
+ pen.setCosmetic(true);
+ p.setPen(pen);
//p.setBrush(config.partColors[i]);
QColor c(config.partColors[i]);
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index 6c0df0b8..79807cd8 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -9,7 +9,7 @@
#include "gconfig.h"
GlobalConfigValues config = {
- 128, // globalAlphaBlend
+ 150, // globalAlphaBlend
{
QColor(0xff, 0xff, 0xff), // palette
QColor(0xff, 0xff, 0xff),
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 577a9c82..cd4cb18a 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -39,7 +39,7 @@ static const char* valu[] = {
};
GlobalConfigValues config = {
- 128, // globalAlphaBlend
+ 150, // globalAlphaBlend
{
QColor(0xff, 0xff, 0xff), // palette
QColor(0xff, 0xff, 0xff),