- Ribbon SplitButton Galleries can now be "Checked" via their connected TRibbonCollectionAction, similar to normal split buttons which can have a ToggleButton as top element

- Unified "OnSelect" handling of TUICommandCollections:
We had two handlers before, one in TRibbonCollectionAction and one in the related TUICommandActionActionLink. This is now all handled in TUICommandActionActionLink.
This fixes an issue where the assignment of the event handler could be done in a different order, which would lead to only one of them being executed.

Author: SaschaSchaefer

Lib/UIRibbonActions.pas

@@ -58,6 +58,7 @@   TUICommandCollectionActionLink = class(TUICommandActionLink)
   {$ENDREGION 'Internal Declarations'}
   protected
     procedure SetAction(Value: TBasicAction); override;
+    procedure SetChecked(Value: Boolean); override;
   end;
 
   TUICommandDecimalActionLink = class(TUICommandActionLink)
@@ -139,14 +140,11 @@   TRibbonCollectionAction = class(TRibbonAction<TUICommandCollection>)
       fActionList: TList<TCustomAction>;
       fSelectedItem: Integer;
       fSelectionInitialized: Boolean;
-      fOriginalOnSelect: TUICommandCollectionSelectEvent;
       fUpdateCount: Integer;
       /// This flag indicates that a refresh should be performed as soon as the collection is not being displayed anymore.
       fRefreshWhenNotDisplayed: Boolean;
       function GetItem(pIndex: Integer): TCustomAction;
       procedure SetSelectedItem(const pValue: Integer);
-      /// Triggered on user induced selection changes. This handler will apply them to the action.
-      procedure UICommandItemSelected(const Args: TUICommandCollectionEventArgs);
     public
       constructor Create(AOwner: TComponent); override;
       destructor Destroy; override;
@@ -203,6 +201,7 @@   TRibbonCollectionAction = class(TRibbonAction<TUICommandCollection>)
       property SelectedItem: Integer read fSelectedItem write SetSelectedItem;
     published
       property ImageIndex;
+      property Checked;
   end;
 
   /// <summary>
@@ -443,9 +442,13 @@ procedure TUICommandActionActionLink.SetAction(Value: TBasicAction);
 
 { TUICommandCollectionActionLink }
 
-procedure TUICommandCollectionActionLink.CommandSelect(
-  const Args: TUICommandCollectionEventArgs);
+procedure TUICommandCollectionActionLink.CommandSelect(const Args: TUICommandCollectionEventArgs);
 begin
+  // Ignore events where the user only hovers over a selection. We only want to react to actual click events, i.e. when the selection changes.
+  if Args.Verb <> TUICommandVerb.cvExecute then
+    Exit;
+
+  (Action as TRibbonCollectionAction).SelectedItem := Args.ItemIndex;
   if Assigned(Action) then
     Action.Execute;
 end;
@@ -460,6 +463,14 @@ procedure TUICommandCollectionActionLink.SetAction(Value: TBasicAction);
   end;
 end;
 
+procedure TUICommandCollectionActionLink.SetChecked(Value: Boolean);
+begin
+  inherited;
+  // Split button galleries have a "Checked" property, set it to the same state as
+  // its corresponding TAction element has.
+  (Client as TUICommandCollection).Checked := Value;
+end;
+
 { TUICommandDecimalActionLink }
 
 procedure TUICommandDecimalActionLink.CommandChange(
@@ -681,17 +692,6 @@ procedure TRibbonCollectionAction.Remove(pAction: TCustomAction);
   RefreshCommandCollection;
 end;
 
-procedure TRibbonCollectionAction.UICommandItemSelected(const Args: TUICommandCollectionEventArgs);
-begin
-  // Ignore events where the user only hovers over a selection. We only want to react to actual click events, i.e. when the selection changes.
-  if Args.Verb <> TUICommandVerb.cvExecute then
-    exit;
-
-  fSelectedItem := UICommand.SelectedItem;
-  if Assigned(fOriginalOnSelect) then
-    fOriginalOnSelect(Args);
-end;
-
 procedure TRibbonCollectionAction.SetSelectedItem(const pValue: Integer);
 begin
   fSelectedItem := pValue;
@@ -707,8 +707,6 @@ function TRibbonCollectionAction.Update(): Boolean;
   if Assigned(UICommand) and not (fSelectionInitialized) then
   begin
     UICommand.SelectedItem := fSelectedItem;
-    fOriginalOnSelect := UICommand.OnSelect;
-    UICommand.OnSelect := UICommandItemSelected;
     fSelectionInitialized := True;
   end;
   if fRefreshWhenNotDisplayed and not IsCurrentlyDisplayed then