From b631c781f93247dd8d27e966aeebe26d879e5d63 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Sat, 27 Apr 2019 08:52:49 -0400
Subject: Remove the compositing with gpu accel only option. Not used in the
 backend any more.

---
 src-qt5/core-utils/lumina-config/pages/page_compton.cpp | 4 +---
 src-qt5/core-utils/lumina-config/pages/page_compton.ui  | 9 +--------
 src-qt5/core/lumina-session/session.cpp                 | 4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
index 3b61869f..2d407d93 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
@@ -28,7 +28,6 @@ void page_compton::SaveSettings(){
   emit HasPendingChanges(false);
   QSettings settings("lumina-desktop","sessionsettings");
     settings.setValue("enableCompositing", !ui->check_disablecompton->isChecked());
-    settings.setValue("compositingWithGpuAccelOnly", ui->check_GPUverify->isChecked());
   QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
   LUtils::writeFile(set, ui->text_file->toPlainText().split("\n"),true);
 }
@@ -37,7 +36,6 @@ void page_compton::LoadSettings(int){
   emit ChangePageTitle( tr("Window Effects") );
   QSettings settings("lumina-desktop","sessionsettings");
     ui->check_disablecompton->setChecked( !settings.value("enableCompositing", false).toBool() );
-    ui->check_GPUverify->setChecked( settings.value("compositingWithGpuAccelOnly", true).toBool() );
   QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
   qDebug() << "Load Compton settings:" << set;
   ui->text_file->setPlainText( LUtils::readFile(set).join("\n") );
@@ -49,7 +47,7 @@ emit HasPendingChanges(false);
 }
 
 //=================
-//         PRIVATE 
+//         PRIVATE
 //=================
 
 //=================
diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.ui b/src-qt5/core-utils/lumina-config/pages/page_compton.ui
index 857331d6..e82cd36e 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_compton.ui
+++ b/src-qt5/core-utils/lumina-config/pages/page_compton.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>428</width>
     <height>300</height>
    </rect>
   </property>
@@ -33,13 +33,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="check_GPUverify">
-     <property name="text">
-      <string>Only use compositing with GPU acceleration </string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QPlainTextEdit" name="text_file"/>
    </item>
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index c3367bc1..6115c365 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -189,14 +189,14 @@ void LSession::start(bool unified){
 	    QString cmd = "fluxbox -rc "+confDir+"/fluxbox-init -no-slit -no-toolbar";
 	    startProcess("wm", cmd, QStringList() << confDir+"/fluxbox-init" << confDir+"/fluxbox-keys");
 	  }
-	  //Compositing manager
-	  setupCompositor();
   } else {
 	if(!LUtils::isValidBinary(WM)){
 	  exit(1);
 	}
 	startProcess("wm", WM);
   }
+  //Compositing manager
+  setupCompositor();
   //Desktop Next
   LSingleApplication::removeLocks("lumina-desktop");
   startProcess("runtime","lumina-desktop");
-- 
cgit