Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve UIMenu positioning (allow to take into account the trigger button to position).

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-01-01 14:17:10 -03:00
parent d9d0a3539b
commit 014d2b767c
3 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/eepp/ui/uimenu.hpp
View File

@@ -16,7 +16,7 @@ class EE_API UIMenu : public UIWidget {
static UIMenu* New();
static void findBestMenuPos( Vector2f& position, UIWidget* menu, UIMenu* parent = NULL,
UIMenuSubMenu* subMenu = NULL );
UIMenuSubMenu* subMenu = NULL, Node* trigger = NULL );
UIMenu();

45
src/eepp/ui/uimenu.cpp
View File

@@ -693,8 +693,8 @@ bool UIMenu::isChildOrSubMenu( Node* node ) {
( mCurrentSubMenu && mCurrentSubMenu->isChildOrSubMenu( node ) );
}
void UIMenu::findBestMenuPos( Vector2f& pos, UIWidget* menu, UIMenu* parent,
UIMenuSubMenu* subMenu ) {
void UIMenu::findBestMenuPos( Vector2f& pos, UIWidget* menu, UIMenu* parent, UIMenuSubMenu* subMenu,
Node* trigger ) {
SceneNode* sceneNode = menu->getSceneNode();
if ( nullptr == sceneNode )
@@ -706,7 +706,46 @@ void UIMenu::findBestMenuPos( Vector2f& pos, UIWidget* menu, UIMenu* parent,
Rectf qPos( pos.x, pos.y, pos.x + menu->getPixelsSize().getWidth(),
pos.y + menu->getPixelsSize().getHeight() );
if ( nullptr != parent && nullptr != subMenu ) {
if ( nullptr != trigger ) {
Rectf qTrigger = trigger->getScreenRect();
// Try to position below the trigger
pos.y = qTrigger.Bottom;
qPos.Top = pos.y;
qPos.Bottom = qPos.Top + menu->getPixelsSize().getHeight();
if ( !qScreen.contains( qPos ) ) {
// Try to position above the trigger
pos.y = qTrigger.Top - menu->getPixelsSize().getHeight();
qPos.Top = pos.y;
qPos.Bottom = qPos.Top + menu->getPixelsSize().getHeight();
if ( !qScreen.contains( qPos ) ) {
// Try to position to the right of the trigger
pos.x = qTrigger.Right;
pos.y = qTrigger.Top;
qPos.Left = pos.x;
qPos.Right = qPos.Left + menu->getPixelsSize().getWidth();
qPos.Top = pos.y;
qPos.Bottom = qPos.Top + menu->getPixelsSize().getHeight();
if ( !qScreen.contains( qPos ) ) {
// Try to position to the left of the trigger
pos.x = qTrigger.Left - menu->getPixelsSize().getWidth();
qPos.Left = pos.x;
qPos.Right = qPos.Left + menu->getPixelsSize().getWidth();
if ( !qScreen.contains( qPos ) ) {
// Reset to original position if no better position found
pos = oriPos;
qPos.Left = pos.x;
qPos.Right = qPos.Left + menu->getPixelsSize().getWidth();
qPos.Top = pos.y;
qPos.Bottom = qPos.Top + menu->getPixelsSize().getHeight();
}
}
}
}
} else if ( nullptr != parent && nullptr != subMenu ) {
Rectf qPrevMenu;
bool clipMenu = parent->getOwnerNode() && parent->getOwnerNode()->getParent() &&
parent->getOwnerNode()->getParent()->isType( UI_TYPE_MENU );

4
src/tools/ecode/plugins/aiassistant/chatui.cpp
View File

@@ -449,7 +449,7 @@ LLMChatUI::LLMChatUI( PluginManager* manager ) :
menu->runOnMainThread( [this, menu] {
auto pos( mChatAttach->getScreenPos() );
UIMenu::findBestMenuPos( pos, menu );
UIMenu::findBestMenuPos( pos, menu, nullptr, nullptr, mChatAttach );
menu->showAtScreenPosition( pos );
} );
} );
@@ -516,7 +516,7 @@ LLMChatUI::LLMChatUI( PluginManager* manager ) :
menu->runOnMainThread( [this, menu] {
auto pos( mChatMore->getScreenPos() );
UIMenu::findBestMenuPos( pos, menu );
UIMenu::findBestMenuPos( pos, menu, nullptr, nullptr, mChatMore );
menu->showAtScreenPosition( pos );
} );
} );