Fixed more visibility problems of FilterPreset controls

Burtan · Mar 28, 2020 · ba27fe4 · ba27fe4
1 parent f1d28c7
commit ba27fe4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/main/cpp/controller/LivePresetEditController.cpp b/src/main/cpp/controller/LivePresetEditController.cpp
@@ -67,10 +67,6 @@ void LivePresetEditController::onInitDlg() {
         defWndProc = (WNDPROC) SetWindowLongPtr(mHwnd, GWLP_WNDPROC, (LONG_PTR) wndProc);
     }
 
-    ShowWindow(GetDlgItem(mHwnd, IDC_LABEL1), SW_HIDE);
-    ShowWindow(GetDlgItem(mHwnd, IDC_COMBO), SW_HIDE);
-    ShowWindow(GetDlgItem(mHwnd, IDC_SETTINGS), SW_HIDE);
-
     //create combobox
     mCombo = std::make_unique<ComboBox>(GetDlgItem(mHwnd, IDC_COMBO));
     auto comboAdapter = std::make_unique<FilterPresetsComboAdapter>(FilterPreset_GetNames(g_lpe->mModel.mFilterPresets));

diff --git a/src/main/cpp/controller/LivePresetsController.cpp b/src/main/cpp/controller/LivePresetsController.cpp
@@ -159,7 +159,7 @@ void LivePresetsController::onContextMenu(HMENU menu) {
     auto indices = mList->getSelectedIndices();
     auto filters = FilterPreset_GetNames(g_lpe->mModel.mFilterPresets);
 
-    if (Licensing_IsUltimate() && !indices.empty()) {
+    if (!indices.empty()) {
 
         //show list of filter presets
         HMENU subMenu = CreatePopupMenu();

diff --git a/src/main/cpp/controller/SettingsController.cpp b/src/main/cpp/controller/SettingsController.cpp
@@ -50,9 +50,6 @@ void SettingsController::onInitDlg() {
     CheckDlgButton(mHwnd, IDC_RECALL_ACTIVE_PRESETS, g_lpe->mModel.mIsReselectLivePresetByValueRecall);
     CheckDlgButton(mHwnd, IDC_HIDE_MUTED_TRACKS, g_lpe->mModel.mIsHideMutedTracks);
 
-    ShowWindow(GetDlgItem(mHwnd, IDC_LABEL1), SW_HIDE);
-    ShowWindow(GetDlgItem(mHwnd, IDC_COMBO), SW_HIDE);
-
     //create combo add FilterPreset names and select default
     mCombo = std::make_unique<ComboBox>(GetDlgItem(mHwnd, IDC_COMBO));
     std::vector<std::string*> filterNames = FilterPreset_GetNames(g_lpe->mModel.mFilterPresets);

diff --git a/src/main/headers/resources/resource.rc b/src/main/headers/resources/resource.rc
@@ -67,10 +67,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFR
         FONT 8, "MS Shell Dlg"
 BEGIN
         PUSHBUTTON      "Add Hardware",IDC_ADD,8,8,72,16
-PUSHBUTTON      "Remove Hardware",IDC_REMOVE,88,8,72,16
-PUSHBUTTON      "Add Control",IDC_ADD2,456,8,72,16
-PUSHBUTTON      "Remove Control",IDC_REMOVE2,536,8,72,16
-CONTROL         "TabControl", IDC_TAB,"SysTabControl32",WS_TABSTOP,8,72,600,300
+        PUSHBUTTON      "Remove Hardware",IDC_REMOVE,88,8,72,16
+        PUSHBUTTON      "Add Control",IDC_ADD2,456,8,72,16
+        PUSHBUTTON      "Remove Control",IDC_REMOVE2,536,8,72,16
+        CONTROL         "TabControl", IDC_TAB,"SysTabControl32",WS_TABSTOP,8,72,600,300
 END
 
 IDD_ABOUT DIALOGEX 0, 0, 600, 300