From d42e7df630140ba97a13bed35b0439641257134d Mon Sep 17 00:00:00 2001
From: Fan PengCheng <fanpengcheng@uniontech.com>
Date: Thu, 6 Aug 2020 20:34:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E6=8E=89=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A=E8=BF=87=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?,=E5=8E=BB=E6=8E=89=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=E7=9A=84=E5=BB=B6=E6=97=B6=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去除部分注释的代码,去掉任务栏启动时的延时加载插件

Log: 精简优化代码
Change-Id: Id4b0e1fe3bfcef9a254089a58282200851a19ae5
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1402
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
---
 frame/main.cpp              |  4 ----
 frame/window/mainwindow.cpp | 13 +++++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/frame/main.cpp b/frame/main.cpp
index 7da0341fe..5c119daf7 100644
--- a/frame/main.cpp
+++ b/frame/main.cpp
@@ -38,7 +38,6 @@
 #include "dbus/dbusdockadaptors.h"
 #include <string>
 
-//#include <sys/mman.h>
 #include <stdio.h>
 #include <time.h>
 #include <execinfo.h>
@@ -195,9 +194,6 @@ int main(int argc, char *argv[])
     signal(SIGABRT, sig_crash);
     signal(SIGFPE,  sig_crash);
 
-    // 锁定物理内存，用于国测测试[会显著增加内存占用]
-    //    qDebug() << "lock memory result:" << mlockall(MCL_CURRENT | MCL_FUTURE);
-
     app.setOrganizationName("deepin");
     app.setApplicationName("dde-dock");
     app.setApplicationDisplayName("DDE Dock");
diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp
index 9a55d3527..576fdd4fb 100755
--- a/frame/window/mainwindow.cpp
+++ b/frame/window/mainwindow.cpp
@@ -131,14 +131,11 @@ MainWindow::~MainWindow()
 
 void MainWindow::launch()
 {
-    setVisible(false);
-    QTimer::singleShot(400, this, [&] {
-        m_launched = true;
-        qApp->processEvents();
-        setVisible(true);
-        m_multiScreenWorker->initShow();
-        m_shadowMaskOptimizeTimer->start();
-    });
+    m_launched = true;
+    qApp->processEvents();
+    setVisible(true);
+    m_multiScreenWorker->initShow();
+    m_shadowMaskOptimizeTimer->start();
 }
 
 void MainWindow::showEvent(QShowEvent *e)