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

Fix some bugs with layer quick-preview:

Browse Source 
* Compute the height of the preview matching the image aspect ratio, to avoid relying on the menu being shown. Also put the preview above the menu, to not hide other buttons.
 * Exit the popup loop when a button is clicked. This works for show/hide, but not for selecting a layer ? I don't get why... Any idea ?

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1887 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2012-01-01 16:15:53 +00:00
parent ad7e0d3f1a
commit dda62b043a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/engine.c
View File

@ -1443,10 +1443,15 @@ void Main_handler(void)
if (button_index == BUTTON_LAYER_SELECT) if (button_index == BUTTON_LAYER_SELECT)
{ {
int x,y; int x,y;
int previewW, previewH;
short layer, prev_layer; short layer, prev_layer;
previewW = Buttons_Pool[BUTTON_LAYER_SELECT].Width / Main_backups->Pages->Nb_layers;
previewH = previewW * Main_image_height / Main_image_width;
// TODO this will give stupid out of screen results for very narrow images...
Open_popup((Buttons_Pool[BUTTON_LAYER_SELECT].X_offset + 2)*Menu_factor_X, Open_popup((Buttons_Pool[BUTTON_LAYER_SELECT].X_offset + 2)*Menu_factor_X,
Menu_Y,Buttons_Pool[BUTTON_LAYER_SELECT].Width / Main_backups->Pages->Nb_layers, Menu_Y - previewH, previewW, previewH);
Menu_bars[MENUBAR_COUNT - 1].Height);
prev_layer = -1; prev_layer = -1;
@ -1454,7 +1459,7 @@ void Main_handler(void)
// so Button_under_mouse still works // so Button_under_mouse still works
Menu_is_visible=Menu_is_visible_before_window; Menu_is_visible=Menu_is_visible_before_window;
Menu_Y=Menu_Y_before_window; Menu_Y=Menu_Y_before_window;
while(Button_under_mouse() == BUTTON_LAYER_SELECT) while(Button_under_mouse() == BUTTON_LAYER_SELECT && Mouse_K == 0)
{ {
layer = Layer_under_mouse(); layer = Layer_under_mouse();
if (layer != prev_layer) if (layer != prev_layer)
@ -1474,7 +1479,12 @@ void Main_handler(void)
Get_input(20); Get_input(20);
}; };
x = Mouse_K;
Close_popup(); Close_popup();
Mouse_K = x; // Close_popup waits for end of click and resets Mouse_K...
goto HANDLE_CLICK;
} }
Print_in_menu(Menu_tooltip[button_index],0); Print_in_menu(Menu_tooltip[button_index],0);
@ -1514,6 +1524,7 @@ void Main_handler(void)
// Gestion des clicks // Gestion des clicks
if (Mouse_K) if (Mouse_K)
{ {
HANDLE_CLICK:
if (Mouse_Y>=Menu_Y) if (Mouse_Y>=Menu_Y)
{ {
if (button_index>=0) if (button_index>=0)