[Bf-blender-cvs] [5877465c202] temp-spreadsheet-row-filter: Don't gray out filter panels when their string is empty

[Hans Goudey]

Commit: 5877465c2020057cb8844890ce3c8d69953b1e3c
Author: Hans Goudey
Date:   Mon Apr 19 16:33:40 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB5877465c2020057cb8844890ce3c8d69953b1e3c

Don't gray out filter panels when their string is empty

===================================================================

M	source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

===================================================================

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index 59978975242..605af6d9c47 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -113,7 +113,9 @@ static void spreadsheet_filter_panel_draw_header(const bContext *C, Panel *panel
                                                     filter->operation;
 
   const SpreadsheetColumn *column = lookup_visible_column_for_filter(*sspreadsheet, column_name);
-  uiLayoutSetActive(layout, column != nullptr);
+  if (column == nullptr && !column_name.is_empty()) {
+    uiLayoutSetActive(layout, false);
+  }
   if (column != nullptr) {
     /* Set the cache of the last data type in the row filter. Two notes:
      *  - Changing data during drawing can be dangerous and should be done with care.
@@ -160,7 +162,10 @@ static void spreadsheet_filter_panel_draw(const bContext *C, Panel *panel)
                                                     filter->operation;
 
   const SpreadsheetColumn *column = lookup_visible_column_for_filter(*sspreadsheet, column_name);
-  uiLayoutSetActive(layout, column != nullptr && filter->flag & SPREADSHEET_ROW_FILTER_ENABLED);
+  if (!(filter->flag & SPREADSHEET_ROW_FILTER_ENABLED) ||
+      (column == nullptr && !column_name.is_empty())) {
+    uiLayoutSetActive(layout, false);
+  }
   const eSpreadsheetColumnValueType data_type = static_cast<eSpreadsheetColumnValueType>(
       filter->last_data_type);