edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added arrows.png; updated the browser sidebar button (#1670 10/10)

Browse source
This commit is contained in:
Jordy Ruiz 2018-11-18 00:06:46 +01:00
parent 92e9ee83d5
commit 03a90a4dd1
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
datasrc/content.py
View file

@ -241,6 +241,7 @@ image_guibuttons = Image("guibuttons", "ui/gui_buttons.png")
image_guiicons = Image("guiicons", "ui/gui_icons.png") image_guiicons = Image("guiicons", "ui/gui_icons.png")
image_menuicons = Image("menuicons", "ui/icons/menu.png") image_menuicons = Image("menuicons", "ui/icons/menu.png")
image_toolicons = Image("toolicons", "ui/icons/tools.png") image_toolicons = Image("toolicons", "ui/icons/tools.png")
image_arrowicons = Image("arrowicons", "ui/icons/arrows.png")
image_friendicons = Image("friendicons", "ui/icons/friend.png") image_friendicons = Image("friendicons", "ui/icons/friend.png")
image_infoicons = Image("infoicons", "ui/icons/info.png") image_infoicons = Image("infoicons", "ui/icons/info.png")
image_levelicons = Image("levelicons", "ui/icons/level.png") image_levelicons = Image("levelicons", "ui/icons/level.png")
@ -263,6 +264,7 @@ container.images.Add(image_guiicons)
container.images.Add(Image("no_skinpart", "ui/no_skinpart.png")) container.images.Add(Image("no_skinpart", "ui/no_skinpart.png"))
container.images.Add(image_menuicons) container.images.Add(image_menuicons)
container.images.Add(image_toolicons) container.images.Add(image_toolicons)
container.images.Add(image_arrowicons)
container.images.Add(image_friendicons) container.images.Add(image_friendicons)
container.images.Add(image_infoicons) container.images.Add(image_infoicons)
container.images.Add(image_levelicons) container.images.Add(image_levelicons)
@ -291,6 +293,7 @@ set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 12, 4)
set_guiicons = SpriteSet("guiicons", image_guiicons, 8, 2) set_guiicons = SpriteSet("guiicons", image_guiicons, 8, 2)
set_menuicons = SpriteSet("menuicons", image_menuicons, 2, 2) set_menuicons = SpriteSet("menuicons", image_menuicons, 2, 2)
set_toolicons = SpriteSet("toolicons", image_toolicons, 4, 2) set_toolicons = SpriteSet("toolicons", image_toolicons, 4, 2)
set_arrowicons = SpriteSet("arrowicons", image_arrowicons, 4, 3)
set_friendicons = SpriteSet("friendicons", image_friendicons, 2, 2) set_friendicons = SpriteSet("friendicons", image_friendicons, 2, 2)
set_infoicons = SpriteSet("infoicons", image_infoicons, 1, 2) set_infoicons = SpriteSet("infoicons", image_infoicons, 1, 2)
set_levelicons = SpriteSet("levelicons", image_levelicons, 3, 2) set_levelicons = SpriteSet("levelicons", image_levelicons, 3, 2)
@ -312,6 +315,7 @@ container.spritesets.Add(set_guibuttons)
container.spritesets.Add(set_guiicons) container.spritesets.Add(set_guiicons)
container.spritesets.Add(set_menuicons) container.spritesets.Add(set_menuicons)
container.spritesets.Add(set_toolicons) container.spritesets.Add(set_toolicons)
container.spritesets.Add(set_arrowicons)
container.spritesets.Add(set_friendicons) container.spritesets.Add(set_friendicons)
container.spritesets.Add(set_infoicons) container.spritesets.Add(set_infoicons)
container.spritesets.Add(set_levelicons) container.spritesets.Add(set_levelicons)
@ -486,6 +490,19 @@ container.sprites.Add(Sprite("tool_edit_b", set_toolicons, 2,1,1,1))
container.sprites.Add(Sprite("tool_x_a", set_toolicons, 3,0,1,1)) container.sprites.Add(Sprite("tool_x_a", set_toolicons, 3,0,1,1))
container.sprites.Add(Sprite("tool_x_b", set_toolicons, 3,1,1,1)) container.sprites.Add(Sprite("tool_x_b", set_toolicons, 3,1,1,1))
container.sprites.Add(Sprite("arrow_left_a", set_arrowicons, 0,0,1,1))
container.sprites.Add(Sprite("arrow_left_b", set_arrowicons, 0,1,1,1))
container.sprites.Add(Sprite("arrow_left_c", set_arrowicons, 0,2,1,1))
container.sprites.Add(Sprite("arrow_up_a", set_arrowicons, 1,0,1,1))
container.sprites.Add(Sprite("arrow_up_b", set_arrowicons, 1,1,1,1))
container.sprites.Add(Sprite("arrow_up_c", set_arrowicons, 1,2,1,1))
container.sprites.Add(Sprite("arrow_right_a", set_arrowicons, 2,0,1,1))
container.sprites.Add(Sprite("arrow_right_b", set_arrowicons, 2,1,1,1))
container.sprites.Add(Sprite("arrow_right_c", set_arrowicons, 2,2,1,1))
container.sprites.Add(Sprite("arrow_down_a", set_arrowicons, 3,0,1,1))
container.sprites.Add(Sprite("arrow_down_b", set_arrowicons, 3,1,1,1))
container.sprites.Add(Sprite("arrow_down_c", set_arrowicons, 3,2,1,1))
container.sprites.Add(Sprite("friend_plus_a", set_friendicons, 0,0,1,1)) container.sprites.Add(Sprite("friend_plus_a", set_friendicons, 0,0,1,1))
container.sprites.Add(Sprite("friend_plus_b", set_friendicons, 0,1,1,1)) container.sprites.Add(Sprite("friend_plus_b", set_friendicons, 0,1,1,1))
container.sprites.Add(Sprite("friend_x_a", set_friendicons, 1,0,1,1)) container.sprites.Add(Sprite("friend_x_a", set_friendicons, 1,0,1,1))

BIN
datasrc/ui/icons/arrows.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

2
src/game/client/components/menus_browser.cpp
View file

@ -1887,7 +1887,7 @@ void CMenus::RenderServerbrowser(CUIRect MainView)
// sidebar button // sidebar button
SidebarButton.HMargin(150.0f, &SidebarButton); SidebarButton.HMargin(150.0f, &SidebarButton);
static CButtonContainer s_SidebarButton; static CButtonContainer s_SidebarButton;
if(DoButton_SpriteID(&s_SidebarButton, IMAGE_INFOICONS, m_SidebarActive?SPRITE_INFO_B:SPRITE_INFO_A, false, &SidebarButton, CUI::CORNER_R, 5.0f, true)) if(DoButton_SpriteID(&s_SidebarButton, IMAGE_ARROWICONS, m_SidebarActive?SPRITE_ARROW_RIGHT_A:SPRITE_ARROW_LEFT_A, false, &SidebarButton, CUI::CORNER_R, 5.0f, true))
{ {
m_SidebarActive ^= 1; m_SidebarActive ^= 1;
} }