Skip to content

Commit 1787c6f

Browse files
authored
Merge pull request #886 from pkova/master
Allow server browser scrolling when serverinfo open
2 parents 8d8a3f3 + 4d9fb0f commit 1787c6f

File tree

1 file changed

+17
-40
lines changed

1 file changed

+17
-40
lines changed

src/EX_browser.c

+17-40
Original file line numberDiff line numberDiff line change
@@ -2201,46 +2201,6 @@ void Serverinfo_Key(int key)
22012201
case K_BACKSPACE:
22022202
Serverinfo_Stop();
22032203
break;
2204-
case K_PGUP:
2205-
if (CTab_GetCurrentId(&sb_tab) == SBPG_PLAYERS)
2206-
{
2207-
if (keydown[K_CTRL])
2208-
Players_pos = 0;
2209-
else
2210-
Players_pos--;
2211-
Players_pos = max(0, Players_pos);
2212-
Serverinfo_Change(all_players[Players_pos]->serv);
2213-
}
2214-
else
2215-
{
2216-
if (keydown[K_CTRL])
2217-
Servers_pos = 0;
2218-
else
2219-
Servers_pos--;
2220-
Servers_pos = max(0, Servers_pos);
2221-
Serverinfo_Change(servers[Servers_pos]);
2222-
}
2223-
break;
2224-
case K_PGDN:
2225-
if (CTab_GetCurrentId(&sb_tab) == SBPG_PLAYERS)
2226-
{
2227-
if (keydown[K_CTRL])
2228-
Players_pos = all_players_n - 1;
2229-
else
2230-
Players_pos++;
2231-
Players_pos = min(all_players_n-1, Players_pos);
2232-
Serverinfo_Change(all_players[Players_pos]->serv);
2233-
}
2234-
else
2235-
{
2236-
if (keydown[K_CTRL])
2237-
Servers_pos = serversn_passed-1;
2238-
else
2239-
Servers_pos++;
2240-
Servers_pos = min(serversn_passed-1, Servers_pos);
2241-
Serverinfo_Change(servers[Servers_pos]);
2242-
}
2243-
break;
22442204
case K_TAB:
22452205
if (keydown[K_SHIFT]) {
22462206
serverinfo_pos--;
@@ -2297,6 +2257,23 @@ void Serverinfo_Key(int key)
22972257
case 'i':
22982258
SB_PingTree_DumpPath(&show_serverinfo->address);
22992259
break;
2260+
case K_MWHEELUP:
2261+
case K_UPARROW:
2262+
case K_PGUP:
2263+
if (!keydown[K_CTRL]) {
2264+
Servers_pos--;
2265+
Servers_pos = max(0, Servers_pos);
2266+
Serverinfo_Change(servers[Servers_pos]);
2267+
break;
2268+
}
2269+
case K_MWHEELDOWN:
2270+
case K_DOWNARROW:
2271+
case K_PGDN:
2272+
if (!keydown[K_CTRL]) {
2273+
Servers_pos++;
2274+
Servers_pos = min(serversn_passed - 1, Servers_pos);
2275+
Serverinfo_Change(servers[Servers_pos]);
2276+
}
23002277
default:
23012278
switch (serverinfo_pos)
23022279
{

0 commit comments

Comments
 (0)