AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 20:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement mouse wheel for table scrolling

Browse Source 
Also pressing Enter should connect to top row if 'hash' input is empty, fix filtering not working after last commit
This commit is contained in:
UnknownShadow200 2018-12-29 16:51:39 +11:00
parent c168ff9e60
commit 5e77b981a2
4 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/LScreens.c
View File

@ -1124,10 +1124,17 @@ static struct ServersScreen {
struct LTable Table;
struct LWidget* _widgets[6];
FontDesc RowFont;
float TableAcc;
} ServersScreen_Instance;
static void ServersScreen_Connect(void* w, int x, int y) {
Launcher_ConnectToServer(&ServersScreen_Instance.IptHash.Text);
struct LTable* table = &ServersScreen_Instance.Table;
String* hash = &ServersScreen_Instance.IptHash.Text;
if (!hash->length && table->RowsCount) {
hash = &LTable_Get(table->TopRow)->Hash;
}
Launcher_ConnectToServer(hash);
}
static void ServersScreen_Refresh(void* w, int x, int y) {
@ -1237,13 +1244,31 @@ static void ServersScreen_Reposition(struct LScreen* s_) {
LTable_Reposition(&s->Table);
}
static void ServersScreen_MouseWheel(struct LScreen* s_, float delta) {
struct ServersScreen* s = (struct ServersScreen*)s_;
s->Table.VTABLE->MouseWheel(&s->Table, delta);
}
static void ServersScreen_KeyDown(struct LScreen* s_, Key key, bool was) {
struct ServersScreen* s = (struct ServersScreen*)s_;
if (!LTable_HandlesKey(key)) {
LScreen_KeyDown(s_, key, was);
} else {
s->Table.VTABLE->KeyDown(&s->Table, key, was);
}
}
struct LScreen* ServersScreen_MakeInstance(void) {
struct ServersScreen* s = &ServersScreen_Instance;
LScreen_Reset((struct LScreen*)s);
s->HidesTitlebar = true;
s->TableAcc = 0.0f;
s->Init = ServersScreen_Init;
s->Free = ServersScreen_Free;
s->Reposition = ServersScreen_Reposition;
s->MouseWheel = ServersScreen_MouseWheel;
s->KeyDown = ServersScreen_KeyDown;
s->OnEnterWidget = (struct LWidget*)&s->BtnConnect;
return (struct LScreen*)s;
}

1
src/LWeb.h
View File

@ -86,6 +86,7 @@ extern struct FetchServersData {
} FetchServersTask;
void FetchServersTask_Run(void);
void FetchServersTask_ResetOrder(void);
#define Servers_Get(i) (&FetchServersTask.Servers[FetchServersTask.Orders[i]])
extern struct CheckUpdateData {

57
src/LWidgets.c
View File

@ -633,14 +633,14 @@ static void FlagColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, i
static void NameColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) {
args->Text = row->Name;
}
static int NameColumn_Sort(struct ServerInfo* a, struct ServerInfo* b) {
static int NameColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return String_Compare(&a->Name, &b->Name);
}
static void PlayersColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) {
String_Format2(&args->Text, "%i/%i", &row->Players, &row->MaxPlayers);
}
static int PlayersColumn_Sort(struct ServerInfo* a, struct ServerInfo* b) {
static int PlayersColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return a->Players - b->Players;
}
@ -657,14 +657,14 @@ static void UptimeColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args,
}
String_Format2(&args->Text, "%i%r", &uptime, &unit);
}
static int UptimeColumn_Sort(struct ServerInfo* a, struct ServerInfo* b) {
static int UptimeColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return a->Uptime - b->Uptime;
}
static void SoftwareColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) {
args->Text = row->Software;
}
static int SoftwareColumn_Sort(struct ServerInfo* a, struct ServerInfo* b) {
static int SoftwareColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return String_Compare(&a->Software, &b->Software);
}
@ -677,9 +677,7 @@ static struct LTableColumn tableColumns[5] = {
};
#define LTable_Get(row) (&FetchServersTask.Servers[FetchServersTask.Servers[row]._order])
static int sortingCol = -1;
/* Works out top and height of the scrollbar */
static void LTable_GetScrollbarCoords(struct LTable* w, int* y, int* height) {
float scale;
@ -875,8 +873,14 @@ static void LTable_DrawScrollbar(struct LTable* w) {
x, w->Y + y, SCROLLBAR_WIDTH, height);
}
static void LTable_KeyDown(struct LTable* w, Key key, bool was) {
bool LTable_HandlesKey(Key key) {
return key == KEY_UP || key == KEY_DOWN || key == KEY_PAGEUP || key == KEY_PAGEDOWN;
}
static void LTable_KeyDown(void* widget, Key key, bool was) {
struct LTable* w = widget;
int index = LTable_GetSelectedIndex(w);
if (key == KEY_UP) {
index--;
} else if (key == KEY_DOWN) {
@ -890,7 +894,8 @@ static void LTable_KeyDown(struct LTable* w, Key key, bool was) {
LTable_SetSelectedTo(w, index);
}
static void LTable_MouseMove(struct LTable* w, int deltaX, int deltaY) {
static void LTable_MouseMove(void* widget, int deltaX, int deltaY) {
struct LTable* w = widget;
int x = Mouse_X - w->X, y = Mouse_Y - w->Y, col;
if (w->DraggingScrollbar) {
@ -914,6 +919,7 @@ static void LTable_RowsClick(struct LTable* w) {
LTable_SetSelectedTo(w, w->TopRow + mouseY / w->RowHeight);
}
/* Handles clicking on column headers (either resizes a column or sort rows) */
static void LTable_HeadersClick(struct LTable* w) {
int x, i, mouseX = Mouse_X - w->X;
@ -957,7 +963,9 @@ static void LTable_ScrollbarClick(struct LTable* w) {
LTable_ClampTopRow(w);
}
static void LTable_MouseDown(struct LTable* w, bool wasSelected) {
static void LTable_MouseDown(void* widget, bool wasSelected) {
struct LTable* w = widget;
if (Mouse_X >= Game_Width - SCROLLBAR_WIDTH) {
LTable_ScrollbarClick(w);
w->DraggingScrollbar = true;
@ -970,6 +978,13 @@ static void LTable_MouseDown(struct LTable* w, bool wasSelected) {
LWidget_Draw(w);
}
static void LTable_MouseWheel(void* widget, float delta) {
struct LTable* w = widget;
w->TopRow -= Utils_AccumulateWheelDelta(&w->_wheelAcc, delta);
LTable_ClampTopRow(w);
LWidget_Draw(w);
}
/* Stops an in-progress dragging of resizing column. */
static void LTable_StopDragging(struct LTable* table) {
table->DraggingColumn = -1;
@ -1003,7 +1018,8 @@ static struct LWidgetVTABLE ltable_VTABLE = {
LTable_Draw, NULL,
LTable_KeyDown, NULL, /* Key */
LTable_MouseMove, NULL, /* Hover */
LTable_MouseDown, LTable_StopDragging /* Select */
LTable_MouseDown, LTable_StopDragging, /* Select */
LTable_MouseWheel, /* Wheel */
};
void LTable_Init(struct LTable* w, const FontDesc* hdrFont, const FontDesc* rowFont) {
w->VTABLE = &ltable_VTABLE;
@ -1018,8 +1034,10 @@ void LTable_Reset(struct LTable* w) {
LTable_StopDragging(w);
LTable_Reposition(w);
w->TopRow = 0;
sortingCol = -1;
w->TopRow = 0;
sortingCol = -1;
w->_wheelAcc = 0.0f;
w->SelectedHash->length = 0;
w->Filter->length = 0;
LTable_Sort(w);
@ -1030,7 +1048,7 @@ void LTable_ApplyFilter(struct LTable* w) {
count = FetchServersTask.NumServers;
for (i = 0, j = 0; i < count; i++) {
if (String_CaselessContains(&FetchServersTask.Servers[i].Name, w->Filter)) {
if (String_CaselessContains(&Servers_Get(i)->Name, w->Filter)) {
FetchServersTask.Servers[j++]._order = FetchServersTask.Orders[i];
}
}
@ -1039,12 +1057,10 @@ void LTable_ApplyFilter(struct LTable* w) {
for (; j < count; j++) {
FetchServersTask.Servers[j]._order = -100000;
}
/* TODO: preserve selected server */
/* TODO: Resort entries again */
LTable_ClampTopRow(w); /* TODO: may need to move this elsewhere */
LTable_ClampTopRow(w);
}
static int LTable_SortOrder(struct ServerInfo* a, struct ServerInfo* b) {
static int LTable_SortOrder(const struct ServerInfo* a, const struct ServerInfo* b) {
int order;
if (sortingCol >= 0) {
order = tableColumns[sortingCol].SortOrder(a, b);
@ -1058,16 +1074,15 @@ static int LTable_SortOrder(struct ServerInfo* a, struct ServerInfo* b) {
static void LTable_QuickSort(int left, int right) {
uint16_t* keys = FetchServersTask.Orders; uint16_t key;
struct ServerInfo* values = FetchServersTask.Servers;
while (left < right) {
int i = left, j = right;
struct ServerInfo* mid = &values[keys[(i + j) >> 1]];
struct ServerInfo* mid = Servers_Get((i + j) >> 1);
/* partition the list */
while (i <= j) {
while (LTable_SortOrder(mid, &values[keys[i]]) < 0) i++;
while (LTable_SortOrder(mid, &values[keys[j]]) > 0) j--;
while (LTable_SortOrder(mid, Servers_Get(i)) < 0) i++;
while (LTable_SortOrder(mid, Servers_Get(j)) > 0) j--;
QuickSort_Swap_Maybe();
}
/* recurse into the smaller subset */

11
src/LWidgets.h
View File

@ -26,6 +26,8 @@ struct LWidgetVTABLE {
void (*OnSelect)(void* widget, bool wasSelected);
/* Called when mouse clicks on another widget. */
void (*OnUnselect)(void* widget);
/* Called when mouse wheel is scrolled and this widget is selected. */
void (*MouseWheel)(void* widget, float delta);
};
#define LWidget_Layout \
@ -124,7 +126,7 @@ struct LTableColumn {
/* Most of the time that's all you need to do. */
void (*DrawRow)(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y);
/* Returns sort order of two rows, based on value of this column in both rows. */
int (*SortOrder)(struct ServerInfo* a, struct ServerInfo* b);
int (*SortOrder)(const struct ServerInfo* a, const struct ServerInfo* b);
/* Whether a vertical gridline (and padding) appears after this. */
bool ColumnGridline;
/* Whether user can interact with this column. */
@ -167,7 +169,11 @@ struct LTable {
bool DraggingScrollbar;
/* Offset of mouse for scrollbar dragging. */
int MouseOffset;
float _wheelAcc; /* mouse wheel accumulator */
};
/* Gets the current ith row */
#define LTable_Get(row) (&FetchServersTask.Servers[FetchServersTask.Servers[row]._order])
/* Initialises a table. */
/* NOTE: Must also call LTable_Reset to make a table actually useful. */
void LTable_Init(struct LTable* table, const FontDesc* hdrFont, const FontDesc* rowFont);
@ -175,6 +181,9 @@ void LTable_Init(struct LTable* table, const FontDesc* hdrFont, const FontDesc*
void LTable_Reset(struct LTable* table);
/* Adjusts Y position of rows and number of visible rows. */
void LTable_Reposition(struct LTable* table);
/* Whether this table would handle the given key being pressed. */
/* e.g. used so pressing up/down works even when another widget is selected */
bool LTable_HandlesKey(Key key);
/* Filters rows to only show those containing 'w->Filter' in the name. */
void LTable_ApplyFilter(struct LTable* table);
/* Sorts the rows in the table by current Sorter function of table */