release/datafiles/userdef/userdef_default_theme.c

@@ -189,8 +189,8 @@ const bTheme U_theme_default = {
     },
     .wcol_list_item = {
       .outline = RGBA(0x2d2d2dff),
-      .inner = RGBA(0x2d2d2d00),
-      .inner_sel = RGBA(0x484a4fff),
+      .inner = RGBA(0xffffff00),
+      .inner_sel = RGBA(0x4772b3ff),
       .item = RGBA(0x4772b3ff),
       .text = RGBA(0xccccccff),
       .text_sel = RGBA(0xffffffff),
@@ -205,15 +205,6 @@ const bTheme U_theme_default = {
       .text_sel = RGBA(0xffffffff),
       .roundness = 0.2f,
     },
-    .wcol_view_item = {
-      .outline = RGBA(0x2d2d2dff),
-      .inner = RGBA(0x303030ff),
-      .inner_sel = RGBA(0x4772b3ff),
-      .item = RGBA(0x4772b3ff),
-      .text = RGBA(0xccccccff),
-      .text_sel = RGBA(0xffffffff),
-      .roundness = 0.2f,
-    },
     .wcol_state = {
       .inner_anim = RGBA(0x53992eff),
       .inner_anim_sel = RGBA(0x38a600ff),

scripts/presets/interface_theme/Blender_Light.xml

@@ -305,7 +305,7 @@
           <ThemeWidgetColors
             outline="#e6e6e6"
             inner="#1a1a1a00"
-            inner_sel="#c0c0c0ff"
+            inner_sel="#668cccff"
             item="#1a1a1aff"
             text="#1a1a1a"
             text_sel="#000000"
@@ -316,21 +316,6 @@
             >
           </ThemeWidgetColors>
         </wcol_list_item>
-        <wcol_view_item>
-          <ThemeWidgetColors
-            outline="#e6e6e6"
-            inner="#c0c0c044"
-            inner_sel="#c0c0c0ff"
-            item="#1a1a1aff"
-            text="#1a1a1a"
-            text_sel="#000000"
-            show_shaded="FALSE"
-            shadetop="0"
-            shadedown="0"
-            roundness="0.4"
-            >
-          </ThemeWidgetColors>
-        </wcol_view_item>
         <wcol_state>
           <ThemeWidgetStateColors
             inner_anim="#73be4c"

scripts/startup/bl_ui/space_userpref.py

@@ -1245,8 +1245,6 @@ class ThemeGenericClassGenerator:
             ("Toolbar Item", "wcol_toolbar_item"),
             ("Tooltip", "wcol_tooltip"),
             ("Value Slider", "wcol_numslider"),
-            # Not used yet, so hide this from the UI.
-            # ("Data-View Item", "wcol_view_item"),
         ]
 
         for (name, wcol) in wcols:

source/blender/blenloader/intern/versioning_userdef.cc

@@ -94,10 +94,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text_hi);
   }
 
-  if (!USER_VERSION_ATLEAST(303, 6)) {
-    btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item;
-  }
-
   if (!USER_VERSION_ATLEAST(306, 3)) {
     FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology);
   }

source/blender/editors/interface/interface_widgets.cc

@@ -3745,25 +3745,6 @@ static void widget_progress_indicator(uiBut *but,
   }
 }
 
-static void widget_view_item(uiWidgetColors *wcol,
-                             rcti *rect,
-                             const uiWidgetStateInfo *state,
-                             int /*roundboxalign*/,
-                             const float zoom)
-{
-  uiWidgetBase wtb;
-  widget_init(&wtb);
-
-  /* no outline */
-  wtb.draw_outline = false;
-  const float rad = widget_radius_from_zoom(zoom, wcol);
-  round_box_edges(&wtb, UI_CNR_ALL, rect, rad);
-
-  if ((state->but_flag & UI_ACTIVE) || (state->but_flag & UI_SELECT)) {
-    widgetbase_draw(&wtb, wcol);
-  }
-}
-
 static void widget_nodesocket(uiBut *but,
                               uiWidgetColors *wcol,
                               rcti *rect,
@@ -4681,6 +4662,7 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
       break;
 
     case UI_WTYPE_LISTITEM:
+    case UI_WTYPE_VIEW_ITEM:
       wt.wcol_theme = &btheme->tui.wcol_list_item;
       wt.draw = widget_list_itembut;
       break;
@@ -4690,11 +4672,6 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
       wt.custom = widget_progress_indicator;
       break;
 
-    case UI_WTYPE_VIEW_ITEM:
-      wt.wcol_theme = &btheme->tui.wcol_view_item;
-      wt.draw = widget_view_item;
-      break;
-
     case UI_WTYPE_NODESOCKET:
       wt.custom = widget_nodesocket;
       break;

source/blender/makesdna/DNA_userdef_types.h

@@ -161,7 +161,6 @@ typedef struct ThemeUI {
   uiWidgetColors wcol_num, wcol_numslider, wcol_tab;
   uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item, wcol_tooltip;
   uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item, wcol_pie_menu;
-  uiWidgetColors wcol_view_item;
 
   uiWidgetStateColors wcol_state;
 

source/blender/makesrna/intern/rna_userdef.cc

@@ -1657,11 +1657,6 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "List Item Colors", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
-  prop = RNA_def_property(srna, "wcol_view_item", PROP_POINTER, PROP_NONE);
-  RNA_def_property_flag(prop, PROP_NEVER_NULL);
-  RNA_def_property_ui_text(prop, "Data-View Item Colors", "");
-  RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
   prop = RNA_def_property(srna, "wcol_state", PROP_POINTER, PROP_NONE);
   RNA_def_property_flag(prop, PROP_NEVER_NULL);
   RNA_def_property_ui_text(prop, "State Colors", "");