mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Code Issues Projects Releases Wiki Activity

Improve radio button appearance in Android menus

Browse source 
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
New field `lastGroupId'.
(Item): New field `isRadio'.
(addItem): New arg `isRadio'.
(inflateMenuItems): Apply an empty radio button group if
required.
* src/androidmenu.c (android_init_emacs_context_menu): Adjust
accordingly.
(android_menu_show): Likewise.
This commit is contained in:
Po Lu 2023-03-17 13:10:23 +08:00
parent da660a1ffa
commit 45b5c9b8b7
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
java/org/gnu/emacs/EmacsContextMenu.java
View file

@ -55,6 +55,9 @@ public final class EmacsContextMenu
/* The serial ID of the last context menu to be displayed. */
public static int lastMenuEventSerial;
/* The last group ID used for a menu item. */
public int lastGroupId;
private static class Item implements MenuItem.OnMenuItemClickListener
{
public int itemID;
@ -62,6 +65,7 @@ public final class EmacsContextMenu
public EmacsContextMenu subMenu;
public boolean isEnabled, isCheckable, isChecked;
public EmacsView inflatedView;
public boolean isRadio;
@Override
public boolean
@ -153,12 +157,14 @@ public final class EmacsContextMenu
checkable. Likewise, if ISCHECKED is set, make the item
checked.
If TOOLTIP is non-NULL, set the menu item tooltip to TOOLTIP. */
If TOOLTIP is non-NULL, set the menu item tooltip to TOOLTIP.
If ISRADIO, then display the check mark as a radio button. */
public void
addItem (int itemID, String itemName, boolean isEnabled,
boolean isCheckable, boolean isChecked,
String tooltip)
String tooltip, boolean isRadio)
{
Item item;
@ -169,6 +175,7 @@ public final class EmacsContextMenu
item.isCheckable = isCheckable;
item.isChecked = isChecked;
item.tooltip = tooltip;
item.isRadio = isRadio;
menuItems.add (item);
}
@ -244,7 +251,11 @@ public final class EmacsContextMenu
}
else
{
menuItem = menu.add (item.itemName);
if (item.isRadio)
menuItem = menu.add (++lastGroupId, Menu.NONE, Menu.NONE,
item.itemName);
else
menuItem = menu.add (item.itemName);
menuItem.setOnMenuItemClickListener (item);
/* If the item ID is zero, then disable the item. */
@ -260,6 +271,12 @@ public final class EmacsContextMenu
if (item.isChecked)
menuItem.setChecked (true);
/* Define an exclusively checkable group if the item is a
radio button. */
if (item.isRadio)
menu.setGroupCheckable (lastGroupId, true, true);
/* If the tooltip text is set and the system is new enough
to support menu item tooltips, set it on the item. */