Skip to content
Open
Changes from all commits
Commits
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
51 changes: 51 additions & 0 deletions files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Pango = imports.gi.Pango;
const SearchProviderManager = imports.ui.searchProviderManager;
const SignalManager = imports.misc.signalManager;
const Params = imports.misc.params;
const CinnamonEntry = imports.ui.cinnamonEntry;

const INITIAL_BUTTON_LOAD = 30;

Expand Down Expand Up @@ -2578,6 +2579,56 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
accessible_role: Atk.Role.ENTRY,
});
this.searchEntry.add_accessible_state(Atk.StateType.EDITABLE);
CinnamonEntry.addContextMenu(this.searchEntry);
this.searchEntry._menuManager.shouldGrab = false;

// Close the search entry context menu when main menu closes
this.menu.connect('open-state-changed', (menu, open) => {
if (!open && this.searchEntry._menu.isOpen) {
this.searchEntry._menu.close();
}
});

// Extend _eventIsOnActiveMenu to include the search entry context menu
// This prevents the main menu from closing when clicking on the context menu
let originalEventIsOnActiveMenu = this.menuManager._eventIsOnActiveMenu.bind(this.menuManager);
this.menuManager._eventIsOnActiveMenu = (event) => {
if (this.searchEntry._menu.isOpen &&
this.searchEntry._menu.actor.contains(event.get_source())) {
return true;
}
return originalEventIsOnActiveMenu(event);
};

// Manual hover effect using direct style pseudo-class (no signals)
let contextMenu = this.searchEntry._menu;
let contextMenuItems = [contextMenu._copyItem, contextMenu._pasteItem];

let updateHoverState = () => {
if (!contextMenu.isOpen) {
for (let item of contextMenuItems) {
item.actor.change_style_pseudo_class('active', false);
}
return true;
}

let [mouseX, mouseY] = global.get_pointer();
for (let item of contextMenuItems) {
let [itemX, itemY] = item.actor.get_transformed_position();
let [width, height] = item.actor.get_size();
let isHovered = (mouseX >= itemX && mouseX <= itemX + width &&
mouseY >= itemY && mouseY <= itemY + height);
item.actor.change_style_pseudo_class('active', isHovered);
}
return true;
};

// Start hover polling when main menu opens
this.menu.connect('open-state-changed', (menu, open) => {
if (open) {
Mainloop.timeout_add(50, updateHoverState);
}
});

this.searchEntry.set_secondary_icon(this._searchInactiveIcon);
this.searchActive = false;
Expand Down
Loading