Commit bf48ede5 authored by Robert Knight's avatar Robert Knight
Browse files

I am a muppet. Correct startup transparency test again. Cross fingers it...

I am a muppet.  Correct startup transparency test again.  Cross fingers it should work properly in composited and uncomposited environments.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=676065
parent 77f003b1
......@@ -87,6 +87,8 @@ ColorSchemeEditor::ColorSchemeEditor(QWidget* parent)
connect( _ui->colorTable , SIGNAL(itemClicked(QTableWidgetItem*)) , this ,
SLOT(editColorItem(QTableWidgetItem*)) );
qDebug() << "Color scheme editor - have compositing = " << KWindowSystem::compositingActive();
// warning label when transparency is not available
if ( KWindowSystem::compositingActive() )
{
......
......@@ -41,8 +41,7 @@ using namespace Konsole;
// Konsole
void fillAboutData(KAboutData& aboutData);
#ifdef Q_WS_X11
void getDisplayInformation(Display*& display , Visual*& visual , Colormap& colormap,
bool& transparencyAvailable);
void getDisplayInformation(Display*& display , Visual*& visual , Colormap& colormap);
#endif
static KCmdLineOptions options[] =
......@@ -93,12 +92,12 @@ extern "C" int KDE_EXPORT kdemain(int argc,char** argv)
Colormap colormap = 0;
bool transparencyAvailable = KWindowSystem::compositingActive();
getDisplayInformation(display,visual,colormap,transparencyAvailable);
if ( transparencyAvailable )
getDisplayInformation(display,visual,colormap);
qDebug() << "Transparency available: " << transparencyAvailable;
Application app;
//Application app(display,Qt::HANDLE(visual),Qt::HANDLE(colormap));
Application app(display,Qt::HANDLE(visual),Qt::HANDLE(colormap));
#else
Application app;
#endif
......@@ -173,8 +172,7 @@ void fillAboutData(KAboutData& aboutData)
// code taken from the Qt 4 graphics dojo examples
#ifdef Q_WS_X11
void getDisplayInformation(Display*& display , Visual*& visual , Colormap& colormap,
bool& transparencyAvailable)
void getDisplayInformation(Display*& display , Visual*& visual , Colormap& colormap)
{
display = XOpenDisplay(0); // open default display
if (!display) {
......@@ -203,8 +201,6 @@ void getDisplayInformation(Display*& display , Visual*& visual , Colormap& color
colormap = XCreateColormap(display, RootWindow(display, screen),
visual, AllocNone);
transparencyAvailable = true;
// found ARGB visual
break;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment