Fix: Charset screen editor: Mega65 color chooser, scaling for 80x modes

Fix: BASIC editor, theme coloring of label background

C64Studio/Documents/CharsetScreenEditor.cs

@@ -2725,6 +2725,13 @@ private void SetupColorChooserDialog()
         case TextCharMode.VIC20_8X16:
           _ColorChooserDlg = new ColorPickerCommodoreVIC20X16( Core, m_CharsetScreen.CharSet, m_CurrentChar, (byte)m_CurrentColor );
           break;
+        case TextCharMode.MEGA65_HIRES:
+        case TextCharMode.MEGA65_NCM:
+        case TextCharMode.MEGA65_FCM:
+        case TextCharMode.MEGA65_ECM:
+        case TextCharMode.MEGA65_FCM_16BIT:
+          _ColorChooserDlg = new ColorPickerMega65_32( Core, m_CharsetScreen.CharSet, m_CurrentChar, (byte)m_CurrentColor );
+          break;
         default:
           _ColorChooserDlg = new ColorPickerCommodore( Core, m_CharsetScreen.CharSet, m_CurrentChar, (byte)m_CurrentColor );
           break;
@@ -2782,6 +2789,14 @@ private void OnCharsetScreenModeChanged()
           displaySize = new Size( 160, 192 );
           clientSize = new Size( displaySize.Width * 4, displaySize.Height * 2 );
           break;
+        case TextMode.MEGA65_80_X_25_ECM:
+        case TextMode.MEGA65_80_X_25_FCM:
+        case TextMode.MEGA65_80_X_25_FCM_16BIT:
+        case TextMode.MEGA65_80_X_25_HIRES:
+        case TextMode.MEGA65_80_X_25_MULTICOLOR:
+        case TextMode.MEGA65_80_X_25_NCM:
+          displaySize = new Size( Lookup.ScreenWidthInCharacters( m_CharsetScreen.Mode ) * 8, Lookup.ScreenHeightInCharacters( m_CharsetScreen.Mode ) * 8 );
+          break;
         default:
           // all others use 16:10 (do they?)
           break;

C64Studio/Documents/SourceBasicEx.cs

@@ -744,6 +744,10 @@ public override void RefreshDisplayOptions()
       BackColor = Core.Theming.DarkenColor( GR.Color.Helper.FromARGB( Core.Settings.BGColor( ColorableElement.BACKGROUND_CONTROL ) ) );
       editSource.ForeColor = GR.Color.Helper.FromARGB( Core.Settings.FGColor( ColorableElement.CODE ) );
 
+      labelBASICVersion.BackColor = BackColor;
+      labelStartAddress.BackColor = BackColor;
+      labelCheckSummer.BackColor  = BackColor;
+
       ApplySyntaxColoring( Types.ColorableElement.EMPTY_SPACE );
       ApplySyntaxColoring( Types.ColorableElement.COMMENT );
       ApplySyntaxColoring( Types.ColorableElement.LITERAL_NUMBER );