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

Fix sliders displayed position. Pfew.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1609 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-09-11 00:37:43 +00:00
parent e44eb104fa
commit 79dbd3722a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/buttons.c
View File

@ -2534,9 +2534,9 @@ void Button_Gradients(void)
Window_set_normal_button(178,128,51,14,"OK",0,1,SDLK_RETURN); // 6 Window_set_normal_button(178,128,51,14,"OK",0,1,SDLK_RETURN); // 6
Window_set_normal_button(123,128,51,14,"Cancel",0,1,KEY_ESC); // 7 Window_set_normal_button(123,128,51,14,"Cancel",0,1,KEY_ESC); // 7
// Scrolling speed // Scrolling speed
speed_scroller = Window_set_horizontal_scroller_button(100,111,129,106,1,Main_backups->Pages->Gradients->Range[Current_gradient].Speed); // 8 speed_scroller = Window_set_horizontal_scroller_button(99,111,130,106,1,Main_backups->Pages->Gradients->Range[Current_gradient].Speed); // 8
Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3); Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3);
Print_in_window(74,113,str,MC_Black,MC_Light); Print_in_window(73,113,str,MC_Black,MC_Light);
Print_in_window(5,58,"MIX",MC_Dark,MC_Light); Print_in_window(5,58,"MIX",MC_Dark,MC_Light);
@ -2590,7 +2590,7 @@ void Button_Gradients(void)
speed_scroller->Position=Main_backups->Pages->Gradients->Range[Current_gradient].Speed; speed_scroller->Position=Main_backups->Pages->Gradients->Range[Current_gradient].Speed;
Window_draw_slider(speed_scroller); Window_draw_slider(speed_scroller);
Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3); Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3);
Print_in_window(74,113,str,MC_Black,MC_Light); Print_in_window(73,113,str,MC_Black,MC_Light);
// Gradient # // Gradient #
gradient_scroller->Position=Current_gradient; gradient_scroller->Position=Current_gradient;
@ -2695,7 +2695,7 @@ void Button_Gradients(void)
Main_backups->Pages->Gradients->Range[Current_gradient].Speed=Window_attribute2; Main_backups->Pages->Gradients->Range[Current_gradient].Speed=Window_attribute2;
Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3); Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3);
Hide_cursor(); Hide_cursor();
Print_in_window(74,113,str,MC_Black,MC_Light); Print_in_window(73,113,str,MC_Black,MC_Light);
Display_cursor(); Display_cursor();
Allow_colorcycling=1; Allow_colorcycling=1;
break; break;

5
src/engine.c
View File

@ -1866,7 +1866,8 @@ void Window_draw_slider(T_Scroller_button * button)
button->Length-24,11,MC_Black/*MC_Dark*/); button->Length-24,11,MC_Black/*MC_Dark*/);
if (button->Nb_elements>button->Nb_visibles) if (button->Nb_elements>button->Nb_visibles)
slider_position+=Round_div(button->Position*(button->Length-24-button->Cursor_length),button->Nb_elements-button->Nb_visibles); slider_position+=
((button->Length-24-button->Cursor_length)*(button->Position)+(button->Nb_elements-button->Nb_visibles)/2)/(button->Nb_elements-button->Nb_visibles);
Window_rectangle(slider_position, Window_rectangle(slider_position,
button->Pos_Y, button->Pos_Y,
@ -1886,7 +1887,7 @@ void Window_draw_slider(T_Scroller_button * button)
if (button->Nb_elements>button->Nb_visibles) if (button->Nb_elements>button->Nb_visibles)
slider_position+= slider_position+=
(button->Length-24-button->Cursor_length)*(button->Position)/(button->Nb_elements-button->Nb_visibles); ((button->Length-24-button->Cursor_length)*(button->Position)+(button->Nb_elements-button->Nb_visibles)/2)/(button->Nb_elements-button->Nb_visibles);
// //
//(button->Position*) / (button->Nb_elements-button->Nb_visibles)); //(button->Position*) / (button->Nb_elements-button->Nb_visibles));