Merge pull request #2624 from Owain94/upstream-2505

This commit is contained in:
Owain van Brakel
2020-05-26 01:00:45 +02:00
committed by GitHub
22 changed files with 183 additions and 49 deletions

View File

@@ -46,7 +46,11 @@ public interface ChatLineBuffer
int getLength();
/**
* Removes a message node
* Removes a message node.
*
* This method modifies the underlying MessageNode array. If removing multiple MessageNodes at a time,
* clone the original {@link #getLines()} array; as items in the array will get modified and be left in an
* inconsistent state.
*
* @param node the {@link MessageNode} to remove
*/

View File

@@ -578,6 +578,12 @@ public class WidgetID
{
static final int PARENT = 0;
static final int BUTTONS = 1;
static final int TAB_ALL = 4;
static final int TAB_GAME = 8;
static final int TAB_PUBLIC = 13;
static final int TAB_PRIVATE = 18;
static final int TAB_CLAN = 23;
static final int TAB_TRADE = 28;
static final int REPORT_TEXT = 36;
static final int FRAME = 37;
static final int TRANSPARENT_BACKGROUND = 38;

View File

@@ -439,6 +439,12 @@ public enum WidgetInfo
CHATBOX_TRANSPARENT_LINES(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TRANSPARENT_BACKGROUND_LINES),
CHATBOX_MESSAGE_LINES(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.MESSAGE_LINES),
CHATBOX_FIRST_MESSAGE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.FIRST_MESSAGE),
CHATBOX_TAB_ALL(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_ALL),
CHATBOX_TAB_GAME(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_GAME),
CHATBOX_TAB_PUBLIC(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_PUBLIC),
CHATBOX_TAB_PRIVATE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_PRIVATE),
CHATBOX_TAB_CLAN(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CLAN),
CHATBOX_TAB_TRADE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_TRADE),
BA_HEAL_WAVE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE),
BA_HEAL_CALL_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL),