[Bf-blender-cvs] [e251f9f869c] temp-vse-channels-edge-panning: bump subversion, remove XXX code

[Richard Antalik]

Commit: e251f9f869c31be48b203065df305050156eb44f
Author: Richard Antalik
Date:   Thu Mar 24 21:21:48 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBe251f9f869c31be48b203065df305050156eb44f

bump subversion, remove XXX code

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

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/blenloader/intern/versioning_userdef.c
M	source/blender/editors/space_sequencer/sequencer_channels_draw.c

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 1639a564508..7686fce3aca 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 6
+#define BLENDER_FILE_SUBVERSION 7
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 2f2a83a1145..57a8aeb8a19 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2577,7 +2577,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
     }
   }
 
-  if (!MAIN_VERSION_ATLEAST(bmain, 302, 6)) {
+  if (!MAIN_VERSION_ATLEAST(bmain, 302, 7)) {
     /* Sequencer channels region. */
     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 3d6d9e77c4d..00289956c5e 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -325,7 +325,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     FROM_DEFAULT_V4_UCHAR(space_sequencer.mask);
   }
 
-  if (!USER_VERSION_ATLEAST(301, 5)) {
+  if (!USER_VERSION_ATLEAST(302, 7)) {
     FROM_DEFAULT_V4_UCHAR(space_sequencer.list);
     FROM_DEFAULT_V4_UCHAR(space_sequencer.list_title);
     FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text);
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.c b/source/blender/editors/space_sequencer/sequencer_channels_draw.c
index 9d933d21e85..d1754d1acbf 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.c
@@ -180,7 +180,8 @@ static bool channel_is_being_renamed(SpaceSeq *sseq, int channel_index)
 
 static float text_size_get(SeqChannelDrawContext *context)
 {
-  return 20 * U.dpi_fac * context->scale;  // XXX
+  const uiStyle *style = UI_style_get_dpi();
+  return UI_fontstyle_height_max(&style->widget) * 1.5f * context->scale;
 }
 
 /* Todo: decide what gets priority - label or buttons */