From 07a2fd4b1a031cd74dc3ca8fa90bbce53a3acb6d Mon Sep 17 00:00:00 2001 From: William Pearson Date: Tue, 11 Apr 2023 16:20:21 -0700 Subject: [PATCH] Remove specification of QToolButton popupMode when there is no menu Specifically, the open button in the Python shell window and the blue channel (only) in the texture viewer had values specified even though they do not have an actual menu associated with the buttons. For the texture viewer, this was explicitly set to the default value (delayed popup); for the Python shell window the value is custom. The popup mode is only used "for tool buttons that has a menu set or contains a list of actions". These were added in early commits for each feature, probably by accident: 0837e66939b264fb9995624664ea2df1a5c40ad1 for the texture viewer and 2a4596e06a78d6a3d335469afccda7bfeef86665 for the Python shell. --- qrenderdoc/Windows/PythonShell.ui | 3 --- qrenderdoc/Windows/TextureViewer.ui | 3 --- 2 files changed, 6 deletions(-) diff --git a/qrenderdoc/Windows/PythonShell.ui b/qrenderdoc/Windows/PythonShell.ui index 14873fcb1..71fabf3f6 100644 --- a/qrenderdoc/Windows/PythonShell.ui +++ b/qrenderdoc/Windows/PythonShell.ui @@ -181,9 +181,6 @@ :/folder_page_white.png:/folder_page_white.png - - QToolButton::InstantPopup - Qt::ToolButtonTextBesideIcon diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui index 32c70012c..cfa143125 100644 --- a/qrenderdoc/Windows/TextureViewer.ui +++ b/qrenderdoc/Windows/TextureViewer.ui @@ -761,9 +761,6 @@ true - - QToolButton::DelayedPopup - true