paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 09:00:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-GTK2: Fixed TMenuItem.Default property. Issue #41528.

Browse Source
This commit is contained in:
Massimo Magnano 2025-03-12 17:44:26 +01:00 committed by Juha
parent 83c1c08a14
commit 6cc25dbb6d
7 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/include/menuitem.inc
View File

@ -1309,9 +1309,12 @@ begin
// Only one item in a menu or submenu can be default.
for i:=0 to FParent.Count-1 do
if FParent[i].Default then
FParent[i].FDefault := False;
FParent[i].Default := False;
FDefault:= AValue;
MenuChanged(True);
if HandleAllocated and not (csReading in ComponentState) and ((FParent <> nil) or (FMenu = nil)) then
TWSMenuItemClass(WidgetSetClass).SetDefault(Self, AValue);
MenuChanged(False);
OwnerFormDesignerModified(Self);
end;
{------------------------------------------------------------------------------

4
lcl/interfaces/gtk2/gtk2int.pas
View File

@ -302,7 +302,9 @@ type
procedure _SetCallbackEx(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject; Direct: Boolean);
procedure SetCallbackEx(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject; Direct: Boolean);
procedure SetCommonCallbacks(const AGTKObject: PGTKObject; const ALCLObject: TObject);
procedure SetLabelCaption(const ALabel: PGtkLabel; const ACaption: String);
function SetLabelCaption(const ALabel: PGtkLabel; const ACaption: String): String;
function SetLabelCaptionMarkup(const ALabel: PGtkLabel; const ACaption: String;
AmpersandsEscape: Boolean=True; MarkupsEscape: Boolean=True): String;
procedure SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
MultiSelect, {%H-}ExtendedSelect: Boolean);
function ForceLineBreaks(DC : hDC; Src: PChar; MaxWidthInPixels : Longint;

40
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -6009,13 +6009,14 @@ end;
------------------------------------------------------------------------------}
procedure UpdateInnerMenuItem(LCLMenuItem: TMenuItem; MenuItemWidget: PGtkWidget;
NewShortCut, ShortCutKey2: TShortCut);
const
WidgetDirection : array[boolean] of longint = (GTK_TEXT_DIR_LTR, GTK_TEXT_DIR_RTL);
function UseRTL: Boolean;
begin
Result := LCLMenuItem.GetIsRightToLeft;
end;
const
WidgetDirection : array[boolean] of longint = (GTK_TEXT_DIR_LTR, GTK_TEXT_DIR_RTL);
var
HBoxWidget: PGtkWidget;
@ -6027,7 +6028,13 @@ var
if (MenuItemWidget = nil) or (LCLMenuItem = nil) then
Exit;
LabelWidget := g_object_get_data(PGObject(MenuItemWidget), 'LCLLabel');
Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption);
if LCLMenuItem.Default then
Gtk2Widgetset.SetLabelCaptionMarkup(LabelWidget,
'<b>'+EscapeMarkups(Ampersands2Underscore(LCLMenuItem.Caption))+'</b>',
False, False)
else
Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption);
gtk_widget_set_direction(PGtkWidget(LabelWidget), WidgetDirection[UseRTL]);
end;
@ -6057,15 +6064,26 @@ var
if LabelWidget = nil then
begin
// create a label for the ShortCut
LabelWidget := PGtkLabel(gtk_label_new(PChar(Pointer(s))));
LabelWidget := PGtkLabel(gtk_label_new(''));
g_object_set_data(PGObject(MenuItemWidget), 'LCLShortCutLabel', LabelWidget);
gtk_label_set_use_markup(LabelWidget, True);
gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
if LCLMenuItem.Default then
gtk_label_set_markup(LabelWidget, PChar('<b>'+EscapeMarkups(s)+'</b>'))
else
gtk_label_set_text(LabelWidget, PChar(s));
gtk_widget_show(PGtkWidget(LabelWidget));
end
else
begin
gtk_label_set_text(LabelWidget, PChar(Pointer(s)));
if LCLMenuItem.Default then
gtk_label_set_markup(LabelWidget, PChar('<b>'+EscapeMarkups(s)+'</b>'))
else
gtk_label_set_text(LabelWidget, PChar(s));
end;
gtk_widget_set_direction(PGtkWidget(LabelWidget), GTK_TEXT_DIR_LTR); //Shortcut always LTR
if UseRTL then
gtk_misc_set_alignment(GTK_MISC(LabelWidget), 0.0, 0.5)
@ -6114,6 +6132,8 @@ var
gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
SetMenuItemLabelText(LCLMenuItem, MenuItemWidget);
//gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(LabelWidget), MenuItemWidget);
gtk_label_set_use_underline(LabelWidget, True);
gtk_label_set_use_markup(LabelWidget, True);
gtk_widget_show(PGtkWidget(LabelWidget));
end;
@ -9166,6 +9186,16 @@ begin
end;
end;
function EscapeMarkups(const Str: String): String;
var
s_escaped: Pgchar;
begin
s_escaped := g_markup_escape_text(PChar(Str), Length(Str));
//MaxM: maybe #95 but even with the escape it is seen as _ and treated as mnemonic
Result := StringReplace(s_escaped, '__', '&#32;', [rfReplaceAll]);
g_free(s_escaped);
end;
{-------------------------------------------------------------------------------
Creates a new PChar. Deletes escaping ampersands, replaces the first single
ampersand with an underscore and deletes all other single ampersands.

3
lcl/interfaces/gtk2/gtk2proc.pp
View File

@ -591,6 +591,9 @@ procedure ConnectInternalWidgetsSignals(AWidget: PGtkWidget;
//--
// markups
function EscapeMarkups(const Str: String): String;
// accelerators
function Ampersands2Underscore(Src: PChar): PChar;
function Ampersands2Underscore(const ASource: String): String;

48
lcl/interfaces/gtk2/gtk2widgetset.inc
View File

@ -950,32 +950,24 @@ begin
ConnectSignal(AGTKObject,'grab-notify',@gtk2GrabNotify, ALCLObject);
end;
procedure TGtk2WidgetSet.SetLabelCaption(const ALabel: PGtkLabel;
const ACaption: String);
var
s: String;
i: Integer;
function TGtk2WidgetSet.SetLabelCaption(const ALabel: PGtkLabel;
const ACaption: String): String;
begin
s := '';
i := 1;
while i <= Length(ACaption) do
begin
case ACaption[i] of
'_': s := s + '__';
'&':
if (i < Length(ACaption)) and (ACaption[i + 1] = '&') then
begin
s := s + '&';
inc(i);
end
else
s := s + '_';
else
s := s + ACaption[i];
end;
inc(i);
end;
gtk_label_set_text_with_mnemonic(ALabel, PChar(s));
Result := Ampersands2Underscore(ACaption);
gtk_label_set_text_with_mnemonic(ALabel, PChar(Result));
end;
function TGtk2WidgetSet.SetLabelCaptionMarkup(const ALabel: PGtkLabel;
const ACaption: String; AmpersandsEscape: Boolean; MarkupsEscape: Boolean): String;
begin
Result := ACaption;
if AmpersandsEscape then
Result := Ampersands2Underscore(Result);
if MarkupsEscape then
Result := EscapeMarkups(Result);
gtk_label_set_use_markup(ALabel, True);
gtk_label_set_markup_with_mnemonic(ALabel, PChar(Result));
end;
{------------------------------------------------------------------------------
@ -987,16 +979,16 @@ procedure TGtk2WidgetSet.SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
var
AControl: TWinControl;
SelectionMode: TGtkSelectionMode;
Selection : PGtkTreeSelection;
Selection: PGtkTreeSelection;
begin
AControl:=TWinControl(Sender);
if (AControl is TWinControl) and
(AControl.fCompStyle in [csListBox, csCheckListBox]) then
begin
if MultiSelect then
SelectionMode:= GTK_SELECTION_MULTIPLE
SelectionMode := GTK_SELECTION_MULTIPLE
else
SelectionMode:= GTK_SELECTION_SINGLE;
SelectionMode := GTK_SELECTION_SINGLE;
Selection := gtk_tree_view_get_selection(GTK_TREE_VIEW(
GetOrCreateWidgetInfo(Widget)^.CoreWidget));

14
lcl/interfaces/gtk2/gtk2wsmenus.pp
View File

@ -44,6 +44,7 @@ type
class procedure SetShortCut(const AMenuItem: TMenuItem; const ShortCutK1, ShortCutK2: TShortCut); override;
class procedure SetVisible(const AMenuItem: TMenuItem; const Visible: boolean); override;
class function SetCheck(const AMenuItem: TMenuItem; const Checked: boolean): boolean; override;
class function SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean; override;
class function SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean; override;
class function SetRadioItem(const AMenuItem: TMenuItem; const {%H-}RadioItem: boolean): boolean; override;
class function SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean; override;
@ -452,6 +453,19 @@ begin
end;
end;
class function TGtk2WSMenuItem.SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean;
var
MenuItemWidget: PGtkWidget;
begin
Result := False;
if not WSCheckMenuItem(AMenuItem, 'SetDefault') then
Exit;
MenuItemWidget:={%H-}PGtkWidget(AMenuItem.Handle);
UpdateInnerMenuItem(AMenuItem,MenuItemWidget);
// gtk_widget_set_sensitive({%H-}PGtkWidget(AMenuItem.Handle), AMenuItem.Enabled);
Result := True;
end;
class function TGtk2WSMenuItem.SetEnable(const AMenuItem: TMenuItem;
const Enabled: boolean): boolean;
begin

6
lcl/widgetset/wsmenus.pp
View File

@ -59,6 +59,7 @@ type
class procedure SetShortCut(const AMenuItem: TMenuItem; const ShortCutK1, ShortCutK2: TShortCut); virtual;
class procedure SetVisible(const AMenuItem: TMenuItem; const Visible: boolean); virtual;
class function SetCheck(const AMenuItem: TMenuItem; const Checked: boolean): boolean; virtual;
class function SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean; virtual;
class function SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean; virtual;
class function SetRadioItem(const AMenuItem: TMenuItem; const RadioItem: boolean): boolean; virtual;
class function SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean; virtual;
@ -157,6 +158,11 @@ begin
Result := false;
end;
class function TWSMenuItem.SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean;
begin
Result := false;
end;
class function TWSMenuItem.SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean;
begin
Result := false;