Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Linux native menus checked entries #633

Merged
nethip merged 10 commits into from
Mar 8, 2018
Merged

Linux native menus checked entries #633

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40c9ca7
Checked menu entries working.
pelatx Feb 19, 2018
e3f6e00
Forgotten callback for checked entry functionality.
pelatx Feb 19, 2018
651d587
Fixes post insertion of new menu item between the original menu item …
pelatx Feb 21, 2018
ca7da21
Fixes visual malfunction (can be seen unchecked) of the split view it…
pelatx Feb 23, 2018
5e6f8a2
Check menu item is created the first time that SetMenuItemState() is …
pelatx Feb 24, 2018
c5e80e4
Typo fix.
pelatx Feb 25, 2018
24218de
New approach that simplifies the code.
pelatx Mar 2, 2018
d6834b4
Removed unnecessary call to gtk_widget_set_sensitive().
pelatx Mar 3, 2018
db7e018
Added @nethip hack to avoid seeing the checkbox disabled in `No Split…
pelatx Mar 7, 2018
5d821c0
Added some checks addressing review comments.
pelatx Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions appshell/appshell_extensions_gtk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,16 +1098,49 @@ int32 GetMenuItemState(CefRefPtr<CefBrowser> browser, ExtensionString commandId,
return NO_ERROR;
}

int _getMenuItemPosition(GtkWidget* parent, GtkWidget* menuItem)
{
GList* children = gtk_container_get_children(GTK_CONTAINER(parent));
int index = 0;
do {
GtkWidget* widget = (GtkWidget*) children->data;
if (widget == menuItem) {
return index;
}
index++;
} while ((children = g_list_next(children)) != NULL);
g_list_free(children);
Copy link
Copy Markdown
Contributor

@nethip nethip Mar 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it neccessary to free the list?


return -1;
}

int32 SetMenuItemState(CefRefPtr<CefBrowser> browser, ExtensionString command, bool& enabled, bool& checked)
{
// TODO: Implement functionality for checked
NativeMenuModel& model = NativeMenuModel::getInstance(getMenuParent(browser));
int tag = model.getTag(command);
if (tag == kTagNotFound) {
return ERR_NOT_FOUND;
}
GtkWidget* menuItem = (GtkWidget*) model.getOsItem(tag);
gtk_widget_set_sensitive(menuItem, enabled);
GtkWidget* parent = gtk_widget_get_parent(menuItem);
Copy link
Copy Markdown
Contributor

@nethip nethip Mar 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When dealing with pointer it is always good to check for NULL pointers, even if it is obvious. That ways the we can avoid an app crash.

int position = _getMenuItemPosition(parent, menuItem);
const gchar* label = gtk_menu_item_get_label(GTK_MENU_ITEM(menuItem));

GtkWidget* newMenuItem;
if (checked == true) {
newMenuItem = gtk_check_menu_item_new_with_label(label);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(newMenuItem), true);
} else if (checked == false){
newMenuItem = gtk_menu_item_new_with_label(label);
}
gtk_widget_destroy(menuItem);

InstallMenuHandler(newMenuItem, browser, tag);
model.setOsItem(tag, newMenuItem);
gtk_menu_shell_insert(GTK_MENU_SHELL(parent), newMenuItem, position);
gtk_widget_set_sensitive(newMenuItem, enabled);
gtk_widget_show(newMenuItem);

return NO_ERROR;
}

Expand Down
⚡