Skip to content

Commit 0b99531

Browse files
GongHeng2017deepin-bot[bot]
authored andcommitted
Fix: The screen size show error.
-- Add Group Policy item to control whether to display screen size. Log: fix issue Bug: https://pms.uniontech.com/bug-view-354275.html
1 parent 348f44d commit 0b99531

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

deepin-devicemanager/assets/org.deepin.devicemanager.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,18 @@
5050
"description": "此配置项默认为空。如果specialComType==8,程序则启用此项配置。",
5151
"permissions": "readwrite",
5252
"visibility": "private"
53+
},
54+
"showScreenSize": {
55+
"value": true,
56+
"serial": 0,
57+
"flags": [
58+
"global"
59+
],
60+
"name": "Is show screen size",
61+
"name[zh_CN]": "是否显示屏幕尺寸",
62+
"description": "是否显示屏幕尺寸,默认为true",
63+
"permissions": "readwrite",
64+
"visibility": "private"
5365
}
5466
}
5567
}

deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -403,7 +403,15 @@ void DeviceMonitor::loadOtherDeviceInfo()
403403
}
404404
}
405405
addOtherDeviceInfo("Primary Monitor", m_MainScreen);
406-
addOtherDeviceInfo("Size", m_ScreenSize);
406+
bool showScreenSize { true };
407+
#ifdef DTKCORE_CLASS_DConfigFile
408+
DConfig *dconfig = DConfig::create("org.deepin.devicemanager","org.deepin.devicemanager");
409+
if(dconfig && dconfig->isValid() && dconfig->keyList().contains("showScreenSize")){
410+
showScreenSize = dconfig->value("showScreenSize").toBool();
411+
}
412+
#endif
413+
if (showScreenSize)
414+
addOtherDeviceInfo("Size", m_ScreenSize);
407415
addOtherDeviceInfo("Serial Number", m_SerialNumber);
408416
// addOtherDeviceInfo("Product Date", m_ProductionWeek);
409417

0 commit comments

Comments
 (0)