summaryrefslogtreecommitdiffstats
path: root/src/kernel/qcolor_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-03 15:03:34 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-03 15:03:34 -0500
commit7446fdb128feb8d941e148f4de341a44256045ef (patch)
tree1af159f8c2088d94780c53458601f17996c6c85b /src/kernel/qcolor_x11.cpp
parent68f557434a089b4eecd682397cc63bcd26a259f7 (diff)
downloadtqt-7446fdb128feb8d941e148f4de341a44256045ef.tar.gz
tqt-7446fdb128feb8d941e148f4de341a44256045ef.zip
Automated update from Qt3
Diffstat (limited to 'src/kernel/qcolor_x11.cpp')
-rw-r--r--src/kernel/qcolor_x11.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 67a3912fb..8f02bcde9 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -407,8 +407,14 @@ uint TQColor::alloc( int screen )
b = sd->blue_shift > 0 ? b << sd->blue_shift : b >> -sd->blue_shift;
pix = (b & sd->blue_mask) | (g & sd->green_mask) | (r & sd->red_mask)
| ~(sd->blue_mask | sd->green_mask | sd->red_mask);
- if ( screen == TQPaintDevice::x11AppScreen() )
+ if (TQPaintDevice::x11AppDepth(screen) == 32) {
+ int a = tqAlpha(d.argb);
+ pix = pix & 0x00ffffff;
+ pix = pix | (a << 24);
+ }
+ if ( screen == TQPaintDevice::x11AppScreen() ) {
d.d32.pix = pix;
+ }
return pix;
}
TQColorData *c = sd->colorDict->find( (long)(d.argb) );