|
@@ -1153,7 +1153,7 @@ begin
|
|
ThemedMarkersAndACVirtualImageList.AutoFill := True;
|
|
ThemedMarkersAndACVirtualImageList.AutoFill := True;
|
|
|
|
|
|
UpdateThemeData(True);
|
|
UpdateThemeData(True);
|
|
-
|
|
|
|
|
|
+
|
|
SetWindowSubclass(StatusBar.Handle, @DarkStatusBarSubclassProc, 0, DWORD_PTR(Self));
|
|
SetWindowSubclass(StatusBar.Handle, @DarkStatusBarSubclassProc, 0, DWORD_PTR(Self));
|
|
|
|
|
|
FMenuBitmaps := TMenuBitmaps.Create;
|
|
FMenuBitmaps := TMenuBitmaps.Create;
|
|
@@ -6573,6 +6573,7 @@ begin
|
|
ThemedMarkersAndACVirtualImageList.ImageCollection := ImagesModule.LightMarkersAndACImageCollection;
|
|
ThemedMarkersAndACVirtualImageList.ImageCollection := ImagesModule.LightMarkersAndACImageCollection;
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+ UpdateThemeData(True);
|
|
UpdateBevel1Visibility;
|
|
UpdateBevel1Visibility;
|
|
UpdateMarginsAndAutoCompleteIcons;
|
|
UpdateMarginsAndAutoCompleteIcons;
|
|
|
|
|
|
@@ -6626,7 +6627,10 @@ begin
|
|
if Open and UseThemes then begin
|
|
if Open and UseThemes then begin
|
|
FProgressThemeData := OpenThemeData(Handle, 'Progress');
|
|
FProgressThemeData := OpenThemeData(Handle, 'Progress');
|
|
FMenuThemeData := OpenThemeData(Handle, 'Menu');
|
|
FMenuThemeData := OpenThemeData(Handle, 'Menu');
|
|
- FToolbarThemeData := OpenThemeData(Handle, 'Toolbar');
|
|
|
|
|
|
+ if FTheme.Dark then
|
|
|
|
+ FToolbarThemeData := OpenThemeData(Handle, 'DarkMode::Toolbar');
|
|
|
|
+ if FToolbarThemeData = 0 then
|
|
|
|
+ FToolbarThemeData := OpenThemeData(Handle, 'Toolbar');
|
|
FStatusBarThemeData := OpenThemeData(Handle, 'Status');
|
|
FStatusBarThemeData := OpenThemeData(Handle, 'Status');
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|