From 788a831f24082d77e8176bf5f42a73ceb2ea2935 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Tue, 1 May 2012 10:06:38 -0300 Subject: [PATCH] bug report module * change modules authors and website * avoid anchors recursivity crash * update README --- BUGS | 1 - README.rdoc | 4 +- TODO | 2 - modules/client/client.otmod | 4 +- modules/client_background/background.otmod | 4 +- modules/client_entergame/entergame.otmod | 4 +- modules/client_locales/locales.otmod | 4 +- .../client_modulemanager/modulemanager.otmod | 4 +- modules/client_options/options.otmod | 4 +- modules/client_terminal/terminal.otmod | 4 +- modules/client_topmenu/topmenu.otmod | 4 +- modules/core_lib/core_lib.otmod | 2 +- modules/core_styles/core_styles.otmod | 2 +- modules/game/game.otmod | 3 +- modules/game_battle/battle.otmod | 4 +- modules/game_bugreport/bugreport.lua | 36 +++++++++++++++++ modules/game_bugreport/bugreport.otmod | 15 +++++++ modules/game_bugreport/bugreport.otui | 40 +++++++++++++++++++ .../game_combatcontrols/combatcontrols.otmod | 4 +- modules/game_console/console.otmod | 4 +- modules/game_containers/containers.otmod | 4 +- modules/game_healthbar/healthbar.otmod | 4 +- modules/game_hotkeys/hotkeys_manager.otmod | 4 +- modules/game_inventory/inventory.otmod | 4 +- modules/game_minimap/minimap.otmod | 4 +- modules/game_npctrade/npctrade.otmod | 4 +- modules/game_outfit/outfit.otmod | 4 +- modules/game_playertrade/playertrade.lua | 39 ++++++++++++++++++ modules/game_playertrade/playertrade.otmod | 4 +- modules/game_questlog/questlog.lua | 6 +-- modules/game_questlog/questlog.otmod | 4 +- .../game_ruleviolation/ruleviolation.otmod | 6 +-- modules/game_skills/skills.otmod | 4 +- modules/game_textbooks/textbooks.lua | 6 +-- modules/game_textbooks/textbooks.otmod | 4 +- modules/game_textmessage/textmessage.otmod | 4 +- modules/game_viplist/viplist.otmod | 4 +- src/framework/ui/uianchorlayout.cpp | 12 +++++- src/framework/ui/uianchorlayout.h | 2 +- 39 files changed, 204 insertions(+), 68 deletions(-) create mode 100644 modules/game_bugreport/bugreport.lua create mode 100644 modules/game_bugreport/bugreport.otmod create mode 100644 modules/game_bugreport/bugreport.otui diff --git a/BUGS b/BUGS index 6e243c81..7a9ef712 100644 --- a/BUGS +++ b/BUGS @@ -1,6 +1,5 @@ == CRASHS modules recursivity makes client crash, it should generate a warning -anchors recursivity makes the client crash == P1 BUGS (affects game play) sometimes minimap desync Z pos diff --git a/README.rdoc b/README.rdoc index 24aee255..9e88e16e 100644 --- a/README.rdoc +++ b/README.rdoc @@ -13,7 +13,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu the creation of new client side stuff in otserv that was not possible before. These include, sound system, graphics effects with shaders, particle engines, modules/addons system, animated textures, styleable user interface, transparency, multi language, in game lua terminal, an OpenGL 1.1/2.0 ES engine that make possible to -run on mobile platforms like Android, iPhone and iPad and much more. Otclient is also flexible enough to +run on mobile platforms like Androi/iPhon/iPad and much more. Otclient is also flexible enough to create tibia tools like map editors just using scripts, because it wasn't designed to be just a client, instead otclient was designed to be a combination of a framework and tibia APIs. @@ -50,7 +50,7 @@ We are currently needing help in the following areas: * Designing new UI themes or improving the current one * Translating the client to other languages * Documenting lua APIs and creating tutorials -* Scripting in lua new modules or improving the current ones +* Scripting with lua new modules or improving the current ones * Porting otclient to other otserv protocols (8.54, 8.7, 9.x, etc) * Spreading otclient project over the web and bring it to new possible contributors * Testing the client itself to report bugs and missing features in our bug tracker diff --git a/TODO b/TODO index 10c0e3c2..c2c2e882 100644 --- a/TODO +++ b/TODO @@ -3,12 +3,10 @@ game_shaders (with shader manager) game_map (with save/load/options) game_minimap (with all tibia functionality) game_playertrade -game_ruleviolations == NOTABLE FEATURES make left panel optional must close last container when opening a new containers -add options "Copy Text", "Copy Name", "Message" in console labels with a popupmenu move chat tabs save/load mini windows states/location when restarting the client graphics options menu diff --git a/modules/client/client.otmod b/modules/client/client.otmod index a0aba95d..4415d580 100644 --- a/modules/client/client.otmod +++ b/modules/client/client.otmod @@ -1,8 +1,8 @@ Module name: client description: Initialize the client and setups its main window - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info autoload: true autoload-priority: 100 reloadable: false diff --git a/modules/client_background/background.otmod b/modules/client_background/background.otmod index a176c9cc..581766de 100644 --- a/modules/client_background/background.otmod +++ b/modules/client_background/background.otmod @@ -1,8 +1,8 @@ Module name: client_background description: Handles the background of the login screen - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - client_topmenu diff --git a/modules/client_entergame/entergame.otmod b/modules/client_entergame/entergame.otmod index 8617200d..e56508b9 100644 --- a/modules/client_entergame/entergame.otmod +++ b/modules/client_entergame/entergame.otmod @@ -1,8 +1,8 @@ Module name: client_entergame description: Manages enter game and character list windows - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - client_topmenu diff --git a/modules/client_locales/locales.otmod b/modules/client_locales/locales.otmod index bd6cccb2..a9983dd4 100644 --- a/modules/client_locales/locales.otmod +++ b/modules/client_locales/locales.otmod @@ -1,8 +1,8 @@ Module name: client_locales description: Translates texts to selected language - author: OTClient team - website: https://github.com/edubart/otclient + author: baxnie + website: www.otclient.info dependencies: - client_topmenu diff --git a/modules/client_modulemanager/modulemanager.otmod b/modules/client_modulemanager/modulemanager.otmod index 368208cd..a8ac0c52 100644 --- a/modules/client_modulemanager/modulemanager.otmod +++ b/modules/client_modulemanager/modulemanager.otmod @@ -1,8 +1,8 @@ Module name: client_modulemanager description: Manage other modules - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - client_topmenu diff --git a/modules/client_options/options.otmod b/modules/client_options/options.otmod index becf92ab..bd6835b9 100644 --- a/modules/client_options/options.otmod +++ b/modules/client_options/options.otmod @@ -1,8 +1,8 @@ Module name: client_options description: Create the options window - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - client_topmenu diff --git a/modules/client_terminal/terminal.otmod b/modules/client_terminal/terminal.otmod index c32b3dc3..684056e6 100644 --- a/modules/client_terminal/terminal.otmod +++ b/modules/client_terminal/terminal.otmod @@ -1,8 +1,8 @@ Module name: client_terminal description: Terminal for executing lua functions - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info @onLoad: | dofile 'terminal' diff --git a/modules/client_topmenu/topmenu.otmod b/modules/client_topmenu/topmenu.otmod index db76bcb6..5f492fed 100644 --- a/modules/client_topmenu/topmenu.otmod +++ b/modules/client_topmenu/topmenu.otmod @@ -1,8 +1,8 @@ Module name: client_topmenu description: Create the top menu - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info @onLoad: | dofile 'topmenu' diff --git a/modules/core_lib/core_lib.otmod b/modules/core_lib/core_lib.otmod index c0d7cc20..eaf473a3 100644 --- a/modules/core_lib/core_lib.otmod +++ b/modules/core_lib/core_lib.otmod @@ -2,7 +2,7 @@ Module name: core_lib description: Contains core lua classes, functions and constants used by other modules author: OTClient team - website: https://github.com/edubart/otclient + website: www.otclient.info autoload: true autoload-priority: 10 reloadable: false diff --git a/modules/core_styles/core_styles.otmod b/modules/core_styles/core_styles.otmod index e45e903b..67b2ad03 100644 --- a/modules/core_styles/core_styles.otmod +++ b/modules/core_styles/core_styles.otmod @@ -2,7 +2,7 @@ Module name: core_styles description: Contains ui styles used by other modules author: OTClient team - website: https://github.com/edubart/otclient + website: www.otclient.info autoload: true autoload-priority: 20 reloadable: false diff --git a/modules/game/game.otmod b/modules/game/game.otmod index 94b46cea..2894f3a9 100644 --- a/modules/game/game.otmod +++ b/modules/game/game.otmod @@ -2,7 +2,7 @@ Module name: game description: Create the game interface, where the ingame stuff starts author: OTClient team - website: https://github.com/edubart/otclient + website: www.otclient.info dependencies: - game_tibiafiles @@ -27,6 +27,7 @@ Module - game_playertrade - game_questlog - game_ruleviolation + - game_bugreport @onLoad: | importStyle 'styles/items.otui' diff --git a/modules/game_battle/battle.otmod b/modules/game_battle/battle.otmod index 3823d403..953335b8 100644 --- a/modules/game_battle/battle.otmod +++ b/modules/game_battle/battle.otmod @@ -1,8 +1,8 @@ Module name: game_battle description: Manage battle window - author: OTClient team - website: https://github.com/edubart/otclient + author: andrefaramir + website: www.otclient.info icon: battle.png dependencies: diff --git a/modules/game_bugreport/bugreport.lua b/modules/game_bugreport/bugreport.lua new file mode 100644 index 00000000..cdf7c8d0 --- /dev/null +++ b/modules/game_bugreport/bugreport.lua @@ -0,0 +1,36 @@ +BugReport = {} + +local bugReportWindow +local bugTextEdit +local HOTKEY = 'Ctrl+Z' + +function BugReport.init() + importStyle 'bugreport.otui' + + bugReportWindow = createWidget('BugReportWindow', rootWidget) + bugReportWindow:hide() + + bugTextEdit = bugReportWindow:getChildById('bugTextEdit') + + Keyboard.bindKeyDown(HOTKEY, BugReport.show) +end + +function BugReport.terminate() + Keyboard.unbindKeyDown(HOTKEY) + bugReportWindow:destroy() + bugReportWindow = nil + bugTextEdit = nil +end + +function BugReport.doReport() + g_game.reportBug(bugTextEdit:getText()) + bugReportWindow:hide() + TextMessage.displayEventAdvance(tr('Bug report sent.')) +end + +function BugReport.show() + bugTextEdit:setText('') + bugReportWindow:show() + bugReportWindow:raise() + bugReportWindow:focus() +end diff --git a/modules/game_bugreport/bugreport.otmod b/modules/game_bugreport/bugreport.otmod new file mode 100644 index 00000000..d6fb62c6 --- /dev/null +++ b/modules/game_bugreport/bugreport.otmod @@ -0,0 +1,15 @@ +Module + name: game_bugreport + description: Bug report interface (Ctrl+Z) + author: edubart + website: www.otclient.info + + dependencies: + - game + + @onLoad: | + dofile 'bugreport' + BugReport.init() + + @onUnload: | + BugReport.terminate() diff --git a/modules/game_bugreport/bugreport.otui b/modules/game_bugreport/bugreport.otui new file mode 100644 index 00000000..10ab1752 --- /dev/null +++ b/modules/game_bugreport/bugreport.otui @@ -0,0 +1,40 @@ +BugReportWindow < MainWindow + !text: tr('Report Bug') + size: 280 250 + &onEnter: BugReport.doReport + @onEscape: self:hide() + + Label + id: bugLabel + !text: tr('Please use this dialog to only report bugs. Do not report rule violations here!') + text-wrap: true + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + height: 32 + + MultilineTextEdit + id: bugTextEdit + anchors.top: bugLabel.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: sendButton.top + margin-top: 4 + margin-bottom: 8 + + Button + id: sendButton + !text: tr('Send') + anchors.bottom: cancelButton.bottom + anchors.right: cancelButton.left + margin-right: 10 + width: 80 + &onClick: BugReport.doReport + + Button + id: cancelButton + !text: tr('Cancel') + anchors.bottom: parent.bottom + anchors.right: parent.right + width: 80 + @onClick: self:getParent():hide() diff --git a/modules/game_combatcontrols/combatcontrols.otmod b/modules/game_combatcontrols/combatcontrols.otmod index d81ba973..23153692 100644 --- a/modules/game_combatcontrols/combatcontrols.otmod +++ b/modules/game_combatcontrols/combatcontrols.otmod @@ -1,8 +1,8 @@ Module name: game_combatcontrols description: Combat controls window - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_console/console.otmod b/modules/game_console/console.otmod index 308ba597..f3a7058b 100644 --- a/modules/game_console/console.otmod +++ b/modules/game_console/console.otmod @@ -1,8 +1,8 @@ Module name: game_console description: Manage chat window - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart, andrefaramir, baxnie + website: www.otclient.info dependencies: - game diff --git a/modules/game_containers/containers.otmod b/modules/game_containers/containers.otmod index a389f8a7..a6172b7b 100644 --- a/modules/game_containers/containers.otmod +++ b/modules/game_containers/containers.otmod @@ -1,8 +1,8 @@ Module name: game_containers description: Manage containers - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart, baxnie + website: www.otclient.info dependencies: - game diff --git a/modules/game_healthbar/healthbar.otmod b/modules/game_healthbar/healthbar.otmod index 5f8769de..4f150be0 100644 --- a/modules/game_healthbar/healthbar.otmod +++ b/modules/game_healthbar/healthbar.otmod @@ -1,8 +1,8 @@ Module name: game_healthbar description: Displays health and mana points - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_hotkeys/hotkeys_manager.otmod b/modules/game_hotkeys/hotkeys_manager.otmod index af9ff48b..88e3f1df 100644 --- a/modules/game_hotkeys/hotkeys_manager.otmod +++ b/modules/game_hotkeys/hotkeys_manager.otmod @@ -1,8 +1,8 @@ Module name: game_hotkeys description: Manage client hotkeys - author: OTClient team - website: https://github.com/edubart/otclient + author: andrefaramir + website: www.otclient.info dependencies: - game diff --git a/modules/game_inventory/inventory.otmod b/modules/game_inventory/inventory.otmod index 202f6df7..4780813d 100644 --- a/modules/game_inventory/inventory.otmod +++ b/modules/game_inventory/inventory.otmod @@ -1,8 +1,8 @@ Module name: game_inventory description: View local player equipments window - author: OTClient team - website: https://github.com/edubart/otclient + author: baxnie, edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_minimap/minimap.otmod b/modules/game_minimap/minimap.otmod index f3513607..4c8e69e7 100644 --- a/modules/game_minimap/minimap.otmod +++ b/modules/game_minimap/minimap.otmod @@ -1,8 +1,8 @@ Module name: game_minimap description: Manage minimap - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_npctrade/npctrade.otmod b/modules/game_npctrade/npctrade.otmod index a9be3321..367c76bd 100644 --- a/modules/game_npctrade/npctrade.otmod +++ b/modules/game_npctrade/npctrade.otmod @@ -1,8 +1,8 @@ Module name: game_npctrade description: NPC trade interface - author: OTClient team - website: https://github.com/edubart/otclient + author: andrefaramir, baxnie + website: www.otclient.info dependencies: - game diff --git a/modules/game_outfit/outfit.otmod b/modules/game_outfit/outfit.otmod index 148ac912..8559c680 100644 --- a/modules/game_outfit/outfit.otmod +++ b/modules/game_outfit/outfit.otmod @@ -1,8 +1,8 @@ Module name: game_outfit description: Change local player outfit - author: OTClient team - website: https://github.com/edubart/otclient + author: baxnie, edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_playertrade/playertrade.lua b/modules/game_playertrade/playertrade.lua index 221603ee..eb85db3c 100644 --- a/modules/game_playertrade/playertrade.lua +++ b/modules/game_playertrade/playertrade.lua @@ -1,7 +1,46 @@ PlayerTrade = {} +-- g_game.inspectTrade(counterOffer, index) +-- g_game.acceptTrade() +-- g_game.rejectTrade() + +local tradeWindow + +local function createTrade() + if tradeWindow then + tradeWindow:destroy() + tradeWindow = nil + end + + tradeWindow = createWidget('TradeWindow', rootWidget) +end + +local function onOwnTrade(name, items) + local firstItem = items[1] + + local tradeItemWidget = tradeWindow:getChildById('tradeItem') + tradeItemWidget:setItem(firstItem) +end + +local function onCounterTrade(name, items) + +end + +local function onCloseTrade() + tradeWindow:destroy() + tradeWindow = nil +end + function PlayerTrade.init() + importStyle 'tradewindow.otui' + + connect(g_game, { onOwnTrade = onGameOwnTrade, + onCounterTrade = onGameCounterTrade, + onCloseTrade = onGameCloseTrade }) end function PlayerTrade.terminate() + disconnect(g_game, { onOwnTrade = onGameOwnTrade, + onCounterTrade = onGameCounterTrade, + onCloseTrade = onGameCloseTrade }) end diff --git a/modules/game_playertrade/playertrade.otmod b/modules/game_playertrade/playertrade.otmod index d82d2fd2..8a36e1a9 100644 --- a/modules/game_playertrade/playertrade.otmod +++ b/modules/game_playertrade/playertrade.otmod @@ -1,8 +1,8 @@ Module name: game_playertrade description: Allow to trade items with players - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_questlog/questlog.lua b/modules/game_questlog/questlog.lua index 477b1ecf..695df56a 100644 --- a/modules/game_questlog/questlog.lua +++ b/modules/game_questlog/questlog.lua @@ -4,9 +4,6 @@ local questLogButton local questLogWindow local questLineWindow --- g_game.requestQuestLog() --- g_game.requestQuestLine(questId) - local function onGameQuestLog(quests) QuestLog.destroyWindows() @@ -84,4 +81,7 @@ function QuestLog.terminate() disconnect(g_game, { onQuestLine= onGameQuestLine }) QuestLog.destroyWindows() + + questLogButton:destroy() + questLogButton = nil end diff --git a/modules/game_questlog/questlog.otmod b/modules/game_questlog/questlog.otmod index 9191c09c..cbc36591 100644 --- a/modules/game_questlog/questlog.otmod +++ b/modules/game_questlog/questlog.otmod @@ -1,8 +1,8 @@ Module name: game_questlog description: View game quests status - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_ruleviolation/ruleviolation.otmod b/modules/game_ruleviolation/ruleviolation.otmod index 33d976bf..7efb1d5f 100644 --- a/modules/game_ruleviolation/ruleviolation.otmod +++ b/modules/game_ruleviolation/ruleviolation.otmod @@ -1,8 +1,8 @@ Module name: game_ruleviolation - description: Rule violation interface - author: OTClient team - website: https://github.com/edubart/otclient + description: Rule violation interface (Ctrl+Y) + author: andrefaramir + website: www.otclient.info dependencies: - game diff --git a/modules/game_skills/skills.otmod b/modules/game_skills/skills.otmod index caf4cbe6..75ce8f40 100644 --- a/modules/game_skills/skills.otmod +++ b/modules/game_skills/skills.otmod @@ -1,8 +1,8 @@ Module name: game_skills description: Manage skills window - author: OTClient team - website: https://github.com/edubart/otclient + author: baxnie, edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_textbooks/textbooks.lua b/modules/game_textbooks/textbooks.lua index 1affe45d..2126a395 100644 --- a/modules/game_textbooks/textbooks.lua +++ b/modules/game_textbooks/textbooks.lua @@ -15,15 +15,15 @@ local function onGameEditText(id, itemId, maxLength, text, writter, time) textEdit:setText(text) textEdit:setEnabled(writeable) - local desc = tr('You read the following') + local desc = '' if #writter > 0 then - desc = desc .. tr(', written by \n%s\n', writter) + desc = tr('You read the following, written by \n%s\n', writter) if #time > 0 then desc = desc .. tr('on %s.\n', time) end elseif #time > 0 then - desc = desc .. tr(', written on %s.\n', time) + desc = tr('You read the following, written on %s.\n', time) end if #text == 0 and not writeable then diff --git a/modules/game_textbooks/textbooks.otmod b/modules/game_textbooks/textbooks.otmod index 0c6129fa..1a470e93 100644 --- a/modules/game_textbooks/textbooks.otmod +++ b/modules/game_textbooks/textbooks.otmod @@ -1,8 +1,8 @@ Module name: game_textbooks description: Allow to edit text books and lists - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_textmessage/textmessage.otmod b/modules/game_textmessage/textmessage.otmod index bc138c5d..6d4cfe2b 100644 --- a/modules/game_textmessage/textmessage.otmod +++ b/modules/game_textmessage/textmessage.otmod @@ -1,8 +1,8 @@ Module name: game_textmessage description: Manage game text messages - author: OTClient team - website: https://github.com/edubart/otclient + author: edubart + website: www.otclient.info dependencies: - game diff --git a/modules/game_viplist/viplist.otmod b/modules/game_viplist/viplist.otmod index fa7d8b4e..a2ac2ecb 100644 --- a/modules/game_viplist/viplist.otmod +++ b/modules/game_viplist/viplist.otmod @@ -1,8 +1,8 @@ Module name: game_viplist description: Manage vip list window - author: OTClient team - website: https://github.com/edubart/otclient + author: baxnie, edubart + website: www.otclient.info @onLoad: | dofile 'viplist' diff --git a/src/framework/ui/uianchorlayout.cpp b/src/framework/ui/uianchorlayout.cpp index d514aadf..23aa6783 100644 --- a/src/framework/ui/uianchorlayout.cpp +++ b/src/framework/ui/uianchorlayout.cpp @@ -86,12 +86,20 @@ void UIAnchorLayout::removeWidget(const UIWidgetPtr& widget) removeAnchors(widget); } -bool UIAnchorLayout::updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anchorGroup) +bool UIAnchorLayout::updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anchorGroup, UIWidgetPtr first) { UIWidgetPtr parentWidget = getParentWidget(); if(!parentWidget) return false; + if(first == widget) { + logError("child '", widget->getId(), "' of parent widget '", parentWidget->getId(), "' is recursively anchored to itself, please fix this"); + return false; + } + + if(!first) + first = widget; + Rect newRect = widget->getRect(); bool verticalMoved = false; bool horizontalMoved = false; @@ -125,7 +133,7 @@ bool UIAnchorLayout::updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anch if(it != m_anchorsGroups.end()) { UIAnchorGroup& hookedAnchorGroup = it->second; if(!hookedAnchorGroup.isUpdated()) - updateWidget(hookedWidget, hookedAnchorGroup); + updateWidget(hookedWidget, hookedAnchorGroup, first); } } diff --git a/src/framework/ui/uianchorlayout.h b/src/framework/ui/uianchorlayout.h index 09c8c6fa..fa8fb46b 100644 --- a/src/framework/ui/uianchorlayout.h +++ b/src/framework/ui/uianchorlayout.h @@ -79,7 +79,7 @@ protected: bool internalUpdate(); private: - bool updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anchorGroup); + bool updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anchorGroup, UIWidgetPtr first = nullptr); std::map m_anchorsGroups; };