1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-03 20:32:07 -04:00

display: Fix output config on delete & popup height

This commit is contained in:
purian23
2026-02-24 01:03:51 -05:00
parent 9651a4ca98
commit 51f6f37925
2 changed files with 12 additions and 2 deletions

View File

@@ -231,13 +231,16 @@ Singleton {
const compositor = CompositorService.compositor; const compositor = CompositorService.compositor;
const profilesDir = getProfilesDir(); const profilesDir = getProfilesDir();
const profileFile = profilesDir + "/" + profileId + getProfileExtension(); const profileFile = profilesDir + "/" + profileId + getProfileExtension();
const isActive = SettingsData.getActiveDisplayProfile(compositor) === profileId;
profilesLoading = true; profilesLoading = true;
Proc.runCommand("delete-profile", ["rm", "-f", profileFile], (output, exitCode) => { Proc.runCommand("delete-profile", ["rm", "-f", profileFile], (output, exitCode) => {
profilesLoading = false; profilesLoading = false;
SettingsData.removeDisplayProfile(compositor, profileId); SettingsData.removeDisplayProfile(compositor, profileId);
if (SettingsData.getActiveDisplayProfile(compositor) === profileId) if (isActive) {
SettingsData.setActiveDisplayProfile(compositor, ""); SettingsData.setActiveDisplayProfile(compositor, "");
backendWriteOutputsConfig(allOutputs);
}
const updated = JSON.parse(JSON.stringify(validatedProfiles)); const updated = JSON.parse(JSON.stringify(validatedProfiles));
delete updated[profileId]; delete updated[profileId];
validatedProfiles = updated; validatedProfiles = updated;

View File

@@ -236,7 +236,14 @@ Item {
parent: Overlay.overlay parent: Overlay.overlay
width: root.popupWidth === -1 ? undefined : (root.popupWidth > 0 ? root.popupWidth : (dropdown.width + root.popupWidthOffset)) width: root.popupWidth === -1 ? undefined : (root.popupWidth > 0 ? root.popupWidth : (dropdown.width + root.popupWidthOffset))
height: Math.min(root.maxPopupHeight, (root.enableFuzzySearch ? 54 : 0) + Math.min(filteredOptions.length, 10) * 36 + 16) height: {
let h = root.enableFuzzySearch ? 54 : 0;
if (root.options.length === 0 && root.emptyText !== "")
h += 32;
else
h += Math.min(filteredOptions.length, 10) * 36;
return Math.min(root.maxPopupHeight, h + 16);
}
padding: 0 padding: 0
modal: true modal: true
dim: false dim: false