1 files changed, 9 insertions, 29 deletions

diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index 50b67c55bd6..61cc70830af 100644
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@ -41,6 +41,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "BLT_translation.h"
+
 #include "BLF_api.h"
 
 #include "spreadsheet_intern.hh"
@@ -321,6 +323,8 @@ static float get_default_column_width(const ColumnValues &values)
       return 8.0f;
     case SPREADSHEET_VALUE_TYPE_STRING:
       return 5.0f;
+    case SPREADSHEET_VALUE_TYPE_UNKNOWN:
+      return 2.0f;
   }
   return float_width;
 }
@@ -591,35 +595,10 @@ static void spreadsheet_dataset_region_listener(const wmRegionListenerParams *pa
   spreadsheet_header_region_listener(params);
 }
 
-static void spreadsheet_dataset_region_init(wmWindowManager *wm, ARegion *region)
-{
-  region->v2d.scroll |= V2D_SCROLL_RIGHT;
-  region->v2d.scroll &= ~(V2D_SCROLL_LEFT | V2D_SCROLL_TOP | V2D_SCROLL_BOTTOM);
-  region->v2d.scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
-  region->v2d.scroll |= V2D_SCROLL_VERTICAL_HIDE;
-
-  UI_view2d_region_reinit(&region->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy);
-
-  wmKeyMap *keymap = WM_keymap_ensure(
-      wm->defaultconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0);
-  WM_event_add_keymap_handler(&region->handlers, keymap);
-}
-
 static void spreadsheet_dataset_region_draw(const bContext *C, ARegion *region)
 {
   spreadsheet_update_context_path(C);
-
-  View2D *v2d = &region->v2d;
-  UI_view2d_view_ortho(v2d);
-  UI_ThemeClearColor(TH_BACK);
-
-  draw_dataset_in_region(C, region);
-
-  /* reset view matrix */
-  UI_view2d_view_restore(C);
-
-  /* scrollers */
-  UI_view2d_scrollers_draw(v2d, nullptr);
+  ED_region_panels(C, region);
 }
 
 static void spreadsheet_sidebar_init(wmWindowManager *wm, ARegion *region)
@@ -640,7 +619,7 @@ static void spreadsheet_right_region_listener(const wmRegionListenerParams *UNUS
 {
 }
 
-void ED_spacetype_spreadsheet(void)
+void ED_spacetype_spreadsheet()
 {
   SpaceType *st = (SpaceType *)MEM_callocN(sizeof(SpaceType), "spacetype spreadsheet");
   ARegionType *art;
@@ -710,11 +689,12 @@ void ED_spacetype_spreadsheet(void)
   /* regions: channels */
   art = (ARegionType *)MEM_callocN(sizeof(ARegionType), "spreadsheet dataset region");
   art->regionid = RGN_TYPE_CHANNELS;
-  art->prefsizex = 200 + V2D_SCROLL_WIDTH;
+  art->prefsizex = 150 + V2D_SCROLL_WIDTH;
   art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D;
-  art->init = spreadsheet_dataset_region_init;
+  art->init = ED_region_panels_init;
   art->draw = spreadsheet_dataset_region_draw;
   art->listener = spreadsheet_dataset_region_listener;
+  blender::ed::spreadsheet::spreadsheet_data_set_region_panels_register(*art);
   BLI_addhead(&st->regiontypes, art);
 
   BKE_spacetype_register(st);