From 79dbd3722aaa69a56b30a8ba26c36d13c19c462d Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Sat, 11 Sep 2010 00:37:43 +0000 Subject: [PATCH] Fix sliders displayed position. Pfew. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1609 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/buttons.c | 8 ++++---- src/engine.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/buttons.c b/src/buttons.c index fa0ad310..bf1bc301 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -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(123,128,51,14,"Cancel",0,1,KEY_ESC); // 7 // 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); - 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); @@ -2590,7 +2590,7 @@ void Button_Gradients(void) speed_scroller->Position=Main_backups->Pages->Gradients->Range[Current_gradient].Speed; Window_draw_slider(speed_scroller); 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_scroller->Position=Current_gradient; @@ -2695,7 +2695,7 @@ void Button_Gradients(void) Main_backups->Pages->Gradients->Range[Current_gradient].Speed=Window_attribute2; Num2str(Main_backups->Pages->Gradients->Range[Current_gradient].Speed,str,3); Hide_cursor(); - Print_in_window(74,113,str,MC_Black,MC_Light); + Print_in_window(73,113,str,MC_Black,MC_Light); Display_cursor(); Allow_colorcycling=1; break; diff --git a/src/engine.c b/src/engine.c index 4b734878..9d269bfa 100644 --- a/src/engine.c +++ b/src/engine.c @@ -1866,7 +1866,8 @@ void Window_draw_slider(T_Scroller_button * button) button->Length-24,11,MC_Black/*MC_Dark*/); 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, button->Pos_Y, @@ -1886,7 +1887,7 @@ void Window_draw_slider(T_Scroller_button * button) if (button->Nb_elements>button->Nb_visibles) 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));