Changeset - r21778:716cc2df7a92
Parent rev.
Child rev.
[Not reviewed]
master
0 1 0
peter1138 - 10 years ago 2014-09-26 16:05:42
peter1138@openttd.org
(svn r26923) -Codechange: Make multiplayer lobby fit to icon size.
1 file changed with 27 insertions and 18 deletions:
src/network/network_gui.cpp
27
18
0 comments (0 inline, 0 general)
src/network/network_gui.cpp
➞
Show inline comments
 
@@ -108,7 +108,7 @@ public:
 
		this->Add(new NWidgetLeaf(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_YEARS, STR_NETWORK_SERVER_LIST_YEARS_CAPTION, STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP));
 

			




	
	
	
		
 
		leaf = new NWidgetLeaf(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_INFO, STR_EMPTY, STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP);

			




	
	
	
		
 
		leaf->SetMinimalSize(40, 12);

			




	
	
	
		
 
		leaf->SetMinimalSize(14 + GetSpriteSize(SPR_LOCK).width + GetSpriteSize(SPR_BLOT).width + GetSpriteSize(SPR_FLAGS_BASE).width, 12);

			




	
	
	
		
 
		leaf->SetFill(0, 1);

			




	
	
	
		
 
		this->Add(leaf);

			




	
	
	
		
 

			




	
	
		
 
@@ -235,6 +235,10 @@ protected:

			




	
	
	
		
 
	QueryString name_editbox;     ///< Client name editbox.

			




	
	
	
		
 
	QueryString filter_editbox;   ///< Editbox for filter on servers

			




	
	
	
		
 

			




	
	
	
		
 
	int lock_offset; ///< Left offset for lock icon.

			




	
	
	
		
 
	int blot_offset; ///< Left offset for green/yellow/red compatibility icon.

			




	
	
	
		
 
	int flag_offset; ///< Left offset for langauge flag icon.

			




	
	
	
		
 

			




	
	
	
		
 
	/**

			




	
	
	
		
 
	 * (Re)build the GUI network game list (a.k.a. this->servers) as some

			




	
	
	
		
 
	 * major change has occurred. It ensures appropriate filtering and

			




	
	
		
 
@@ -379,9 +383,13 @@ protected:

			




	
	
	
		
 
		const NWidgetBase *nwi_info = this->GetWidget<NWidgetBase>(WID_NG_INFO);

			




	
	
	
		
 

			




	
	
	
		
 
		/* show highlighted item with a different colour */

			




	
	
	
		
 
		if (highlight) GfxFillRect(nwi_name->pos_x + 1, y - 2, nwi_info->pos_x + nwi_info->current_x - 2, y + FONT_HEIGHT_NORMAL - 1, PC_GREY);

			




	
	
	
		
 
		if (highlight) GfxFillRect(nwi_name->pos_x + 1, y + 1, nwi_info->pos_x + nwi_info->current_x - 2, y + this->resize.step_height - 2, PC_GREY);

			




	
	
	
		
 

			




	
	
	
		
 
		DrawString(nwi_name->pos_x + WD_FRAMERECT_LEFT, nwi_name->pos_x + nwi_name->current_x - WD_FRAMERECT_RIGHT, y, cur_item->info.server_name, TC_BLACK);

			




	
	
	
		
 
		/* offsets to vertically centre text and icons */

			




	
	
	
		
 
		int text_y_offset = (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2 + 1;

			




	
	
	
		
 
		int icon_y_offset = (this->resize.step_height - GetSpriteSize(SPR_BLOT).height) / 2;

			




	
	
	
		
 

			




	
	
	
		
 
		DrawString(nwi_name->pos_x + WD_FRAMERECT_LEFT, nwi_name->pos_x + nwi_name->current_x - WD_FRAMERECT_RIGHT, y + text_y_offset, cur_item->info.server_name, TC_BLACK);

			




	
	
	
		
 

			




	
	
	
		
 
		/* only draw details if the server is online */

			




	
	
	
		
 
		if (cur_item->online) {

			




	
	
		
 
@@ -393,7 +401,7 @@ protected:

			




	
	
	
		
 
				SetDParam(1, cur_item->info.clients_max);

			




	
	
	
		
 
				SetDParam(2, cur_item->info.companies_on);

			




	
	
	
		
 
				SetDParam(3, cur_item->info.companies_max);

			




	
	
	
		
 
				DrawString(nwi_clients->pos_x, nwi_clients->pos_x + nwi_clients->current_x - 1, y, STR_NETWORK_SERVER_LIST_GENERAL_ONLINE, TC_FROMSTRING, SA_HOR_CENTER);

			




	
	
	
		
 
				DrawString(nwi_clients->pos_x, nwi_clients->pos_x + nwi_clients->current_x - 1, y + text_y_offset, STR_NETWORK_SERVER_LIST_GENERAL_ONLINE, TC_FROMSTRING, SA_HOR_CENTER);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			if (nwi_header->IsWidgetVisible(WID_NG_MAPSIZE)) {

			




	
	
		
 
@@ -401,7 +409,7 @@ protected:

			




	
	
	
		
 
				const NWidgetBase *nwi_mapsize = this->GetWidget<NWidgetBase>(WID_NG_MAPSIZE);

			




	
	
	
		
 
				SetDParam(0, cur_item->info.map_width);

			




	
	
	
		
 
				SetDParam(1, cur_item->info.map_height);

			




	
	
	
		
 
				DrawString(nwi_mapsize->pos_x, nwi_mapsize->pos_x + nwi_mapsize->current_x - 1, y, STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT, TC_FROMSTRING, SA_HOR_CENTER);

			




	
	
	
		
 
				DrawString(nwi_mapsize->pos_x, nwi_mapsize->pos_x + nwi_mapsize->current_x - 1, y + text_y_offset, STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT, TC_FROMSTRING, SA_HOR_CENTER);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			if (nwi_header->IsWidgetVisible(WID_NG_DATE)) {

			




	
	
		
 
@@ -410,7 +418,7 @@ protected:

			




	
	
	
		
 
				YearMonthDay ymd;

			




	
	
	
		
 
				ConvertDateToYMD(cur_item->info.game_date, &ymd);

			




	
	
	
		
 
				SetDParam(0, ymd.year);

			




	
	
	
		
 
				DrawString(nwi_date->pos_x, nwi_date->pos_x + nwi_date->current_x - 1, y, STR_JUST_INT, TC_BLACK, SA_HOR_CENTER);

			




	
	
	
		
 
				DrawString(nwi_date->pos_x, nwi_date->pos_x + nwi_date->current_x - 1, y + text_y_offset, STR_JUST_INT, TC_BLACK, SA_HOR_CENTER);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			if (nwi_header->IsWidgetVisible(WID_NG_YEARS)) {

			




	
	
		
 
@@ -420,20 +428,17 @@ protected:

			




	
	
	
		
 
				ConvertDateToYMD(cur_item->info.game_date, &ymd_cur);

			




	
	
	
		
 
				ConvertDateToYMD(cur_item->info.start_date, &ymd_start);

			




	
	
	
		
 
				SetDParam(0, ymd_cur.year - ymd_start.year);

			




	
	
	
		
 
				DrawString(nwi_years->pos_x, nwi_years->pos_x + nwi_years->current_x - 1, y, STR_JUST_INT, TC_BLACK, SA_HOR_CENTER);

			




	
	
	
		
 
				DrawString(nwi_years->pos_x, nwi_years->pos_x + nwi_years->current_x - 1, y + text_y_offset, STR_JUST_INT, TC_BLACK, SA_HOR_CENTER);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			/* Align the sprites */

			




	
	
	
		
 
			y += (FONT_HEIGHT_NORMAL - 10) / 2;

			




	
	
	
		
 

			




	
	
	
		
 
			/* draw a lock if the server is password protected */

			




	
	
	
		
 
			if (cur_item->info.use_password) DrawSprite(SPR_LOCK, PAL_NONE, nwi_info->pos_x + 5, y - 1);

			




	
	
	
		
 
			if (cur_item->info.use_password) DrawSprite(SPR_LOCK, PAL_NONE, nwi_info->pos_x + this->lock_offset, y + icon_y_offset - 1);

			




	
	
	
		
 

			




	
	
	
		
 
			/* draw red or green icon, depending on compatibility with server */

			




	
	
	
		
 
			DrawSprite(SPR_BLOT, (cur_item->info.compatible ? PALETTE_TO_GREEN : (cur_item->info.version_compatible ? PALETTE_TO_YELLOW : PALETTE_TO_RED)), nwi_info->pos_x + 15, y);

			




	
	
	
		
 
			DrawSprite(SPR_BLOT, (cur_item->info.compatible ? PALETTE_TO_GREEN : (cur_item->info.version_compatible ? PALETTE_TO_YELLOW : PALETTE_TO_RED)), nwi_info->pos_x + this->blot_offset, y + icon_y_offset);

			




	
	
	
		
 

			




	
	
	
		
 
			/* draw flag according to server language */

			




	
	
	
		
 
			DrawSprite(SPR_FLAGS_BASE + cur_item->info.server_lang, PAL_NONE, nwi_info->pos_x + 25, y);

			




	
	
	
		
 
			DrawSprite(SPR_FLAGS_BASE + cur_item->info.server_lang, PAL_NONE, nwi_info->pos_x + this->flag_offset, y + icon_y_offset);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
		
 
@@ -456,6 +461,10 @@ public:

			




	
	
	
		
 
		this->list_pos = SLP_INVALID;

			




	
	
	
		
 
		this->server = NULL;

			




	
	
	
		
 

			




	
	
	
		
 
		this->lock_offset = 5;

			




	
	
	
		
 
		this->blot_offset = this->lock_offset + 3 + GetSpriteSize(SPR_LOCK).width;

			




	
	
	
		
 
		this->flag_offset = this->blot_offset + 2 + GetSpriteSize(SPR_BLOT).width;

			




	
	
	
		
 

			




	
	
	
		
 
		this->CreateNestedTree();

			




	
	
	
		
 
		this->vscroll = this->GetScrollbar(WID_NG_SCROLLBAR);

			




	
	
	
		
 
		this->FinishInitNested(WN_NETWORK_WINDOW_GAME);

			




	
	
		
 
@@ -495,18 +504,18 @@ public:

			




	
	
	
		
 
	{

			




	
	
	
		
 
		switch (widget) {

			




	
	
	
		
 
			case WID_NG_CONN_BTN:

			




	
	
	
		
 
				*size = maxdim(GetStringBoundingBox(_lan_internet_types_dropdown[0]), GetStringBoundingBox(_lan_internet_types_dropdown[1]));

			




	
	
	
		
 
				*size = maxdim(*size, maxdim(GetStringBoundingBox(_lan_internet_types_dropdown[0]), GetStringBoundingBox(_lan_internet_types_dropdown[1])));

			




	
	
	
		
 
				size->width += padding.width;

			




	
	
	
		
 
				size->height += padding.height;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_NG_MATRIX:

			




	
	
	
		
 
				resize->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;

			




	
	
	
		
 
				resize->height = WD_MATRIX_TOP + max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;

			




	
	
	
		
 
				size->height = 10 * resize->height;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_NG_LASTJOINED:

			




	
	
	
		
 
				size->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;

			




	
	
	
		
 
				size->height = WD_MATRIX_TOP + max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_NG_LASTJOINED_SPACER:

			




	
	
		
 
@@ -550,7 +559,7 @@ public:

			




	
	
	
		
 
	{

			




	
	
	
		
 
		switch (widget) {

			




	
	
	
		
 
			case WID_NG_MATRIX: {

			




	
	
	
		
 
				uint16 y = r.top + WD_MATRIX_TOP;

			




	
	
	
		
 
				uint16 y = r.top;

			




	
	
	
		
 

			




	
	
	
		
 
				const int max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (int)this->servers.Length());

			




	
	
	
		
 

			




	
	
		
 
@@ -564,7 +573,7 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_NG_LASTJOINED:

			




	
	
	
		
 
				/* Draw the last joined server, if any */

			




	
	
	
		
 
				if (this->last_joined != NULL) this->DrawServerLine(this->last_joined, r.top + WD_MATRIX_TOP, this->last_joined == this->server);

			




	
	
	
		
 
				if (this->last_joined != NULL) this->DrawServerLine(this->last_joined, r.top, this->last_joined == this->server);

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_NG_DETAILS:

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support