m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display font dropdown in skin menu with the selected font.

Browse Source 
Fixes #450.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1882 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2011-12-31 13:27:17 +00:00
parent ee6ddf139b
commit 836c224169
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/buttons.c
View File

@ -1272,7 +1272,7 @@ void Button_Skins(void)
char * cursors[] = { "Solid", "Transparent", "Thin" }; char * cursors[] = { "Solid", "Transparent", "Thin" };
T_Gui_skin * gfx = NULL; T_Gui_skin * gfx = NULL;
byte * new_font;
#define FILESEL_Y 34 #define FILESEL_Y 34
@ -1433,8 +1433,22 @@ void Button_Skins(void)
need_load=1; need_load=1;
break; break;
case 5 : // Font dropdown case 5 : // Font dropdown
{
T_Fileselector_item* fontName;
selected_font = Window_attribute2; // Get the index of the chosen font. selected_font = Window_attribute2; // Get the index of the chosen font.
fontName = Get_item_by_index(&Font_files_list,selected_font);
new_font = Load_font(fontName->Full_name);
if (new_font)
{
free(Menu_font);
Menu_font = new_font;
Print_in_window( 172, 33,"Font:" ,MC_Black,MC_Light);
Print_in_window_limited(font_dropdown->Pos_X+2,font_dropdown->Pos_Y+(font_dropdown->Height-7)/2,
fontName->Short_name,strlen(fontName->Short_name) ,MC_Black,MC_Light);
Update_window_area(172, 33, 8 * 5, 8);
}
break; break;
}
// 6: Cancel // 6: Cancel
case 7 : // Cursor case 7 : // Cursor
selected_cursor = Window_attribute2; selected_cursor = Window_attribute2;
@ -1457,8 +1471,6 @@ void Button_Skins(void)
if(clicked_button == 1) if(clicked_button == 1)
{ {
byte * new_font;
if (gfx != NULL) if (gfx != NULL)
{ {
Set_current_skin(skinsdir, gfx); Set_current_skin(skinsdir, gfx);