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

Fxed and simplified double-click handling in Listboxes (Skins window, Text window, Factory window). Double-clicking a font in Text window 'accepts' the rendering and closes the window.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1736 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2011-02-26 17:43:55 +00:00
parent 34cd4d11cd
commit cdd7f21265
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/buttons.c
View File

@ -1424,12 +1424,12 @@ void Button_Skins(void)
{ {
case 1 : // OK case 1 : // OK
break; break;
case 2 : // doesn't happen case 2 : // double-click file: do nothing
break; break;
case 3 : // doesn't happen case 3 : // doesn't happen
break; break;
case 4 : // a file is selected case 4 : // a file is selected
need_load=1; need_load=1;
break; break;
case 5 : // Font dropdown case 5 : // Font dropdown
selected_font = Window_attribute2; // Get the index of the chosen font. selected_font = Window_attribute2; // Get the index of the chosen font.
@ -5009,10 +5009,6 @@ void Button_Text(void)
/* Cannot happen, event is catched by the list control */ /* Cannot happen, event is catched by the list control */
break; break;
case 6: // Selecteur de fonte
/* Cannot happen, event is catched by the list control */
break;
case 13: // Font selection case 13: // Font selection
selected_font_index = Window_attribute2; selected_font_index = Window_attribute2;
Hide_cursor(); Hide_cursor();
@ -5056,6 +5052,7 @@ void Button_Text(void)
break; break;
case 6: // Double-click font selector
case 11: // OK case 11: // OK
// Save the selector settings // Save the selector settings
list_start = font_list->List_start; list_start = font_list->List_start;

5
src/engine.c
View File

@ -3199,10 +3199,11 @@ short Window_clicked_button(void)
if (old_mouse_k==0 && last_list_number==list->Number && time_now - time_last_click < Config.Double_click_speed) if (old_mouse_k==0 && last_list_number==list->Number && time_now - time_last_click < Config.Double_click_speed)
{ {
time_last_click = time_now; time_last_click = time_now;
Input_sticky_control=0;
// Store the selected value as attribute2 // Store the selected value as attribute2
Window_attribute2=list->List_start + list->Cursor_position; Window_attribute2=list->List_start + list->Cursor_position;
// Return the control ID of the list. // Return the control ID of the "special button" that covers the list.
return list->Number; return list->Entry_button->Number;
} }
time_last_click = time_now; time_last_click = time_now;
last_list_number=list->Number; last_list_number=list->Number;

11
src/factory.c
View File

@ -1706,13 +1706,10 @@ void Button_Brush_Factory(void)
switch (clicked_button) switch (clicked_button)
{ {
case 4: case 2: // Double-click an entry in script list
if (last_selected_item == scriptlist->List_start + scriptlist->Cursor_position) clicked_button=5;
{ break;
// Double click case 4: // Select script
clicked_button=5;
break;
}
last_selected_item = scriptlist->List_start + scriptlist->Cursor_position; last_selected_item = scriptlist->List_start + scriptlist->Cursor_position;
Hide_cursor(); Hide_cursor();
Draw_script_information(Get_item_by_index(&Scripts_selector, Draw_script_information(Get_item_by_index(&Scripts_selector,