From 80982a65b4e0c15a05f8e75535607d2da2217121 Mon Sep 17 00:00:00 2001 From: tanjing Date: Thu, 30 Nov 2023 17:27:55 +0800 Subject: [PATCH] =?UTF-8?q?pro=E5=8A=A0json=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E4=B8=8A=E6=BC=8F=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=89=B2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt5-ukui-filedialog/qt5-ukui-filedialog.pro | 3 +++ ukui-styles/readconfig.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/qt5-ukui-filedialog/qt5-ukui-filedialog.pro b/qt5-ukui-filedialog/qt5-ukui-filedialog.pro index 4ece318..265567e 100644 --- a/qt5-ukui-filedialog/qt5-ukui-filedialog.pro +++ b/qt5-ukui-filedialog/qt5-ukui-filedialog.pro @@ -88,6 +88,9 @@ unix { DISTFILES += \ ukui.json +DISTFILES += \ + filedialogplugin.json + DEFINES += OPEN_ACTIONS_SEPARATOR='\\"open-actions-seperator\\"' DEFINES += CREATE_ACTIONS_SEPARATOR='\\"create-actions-seperator\\"' DEFINES += VIEW_ACTIONS_SEPARATOR='\\"view-actions-seperator\\"' diff --git a/ukui-styles/readconfig.cpp b/ukui-styles/readconfig.cpp index 31c3d8f..108790d 100644 --- a/ukui-styles/readconfig.cpp +++ b/ukui-styles/readconfig.cpp @@ -880,6 +880,7 @@ UKUIColorTheme::TableColorCfg ReadThemeConfig::tableColorCfg(const QPalette pale if(!m_loadConfig) return m_tableColorCfg; + m_readConfig->widgetPalette(palette); m_readConfig->getColorValue(m_tableColorCfg.defaultBrush ,m_theme, UKUITable, property, C_Table_DefaultBrush); m_readConfig->getColorValue(m_tableColorCfg.selectBrush ,m_theme, UKUITable, property, C_Table_SelectBrush); m_readConfig->getColorValue(m_tableColorCfg.disableBrush ,m_theme, UKUITable, property, C_Table_DisableBrush); @@ -1029,6 +1030,7 @@ UKUIColorTheme::ToolTipColorCfg ReadThemeConfig::toolTipColorCfg(const QPalette if(!m_loadConfig) return m_toolTipColorCfg; + m_readConfig->widgetPalette(palette); m_readConfig->getColorValue(m_toolTipColorCfg.backgroundBrush, m_theme, UKUIToolTip, property, C_ToolTip_BackgroundBrush); m_readConfig->getColorValue(m_toolTipColorCfg.backgroundPen, m_theme, UKUIToolTip, property, C_ToolTip_BackgroundPen); return m_toolTipColorCfg;