6,7 → 6,7 |
///#include "use_library.h" |
//const char header[] = "Table"; |
|
#define TABLE_VERSION "0.94a" |
#define TABLE_VERSION "0.95" |
|
// ñòðîêè, êîòîðûå âûâîäèò ïðîãðàììà |
const char *sFileSign = "KolibriTable File\n"; |
122,6 → 122,8 |
#define SIZE_DRAG 4 |
int size_mouse_x, size_mouse_y, size_id, size_state = 0; |
|
int window_is_dragged = 0; // ñåé÷àñ ïåðåòàñêèâàåòñÿ îêíî |
|
// ðàñòàñêèâàíèå ÿ÷åéêè ïðè åå òàùåíèè çà ïðàâûé íèæíèé óãîë, ñ çàïîëíåíèåì ÿ÷ååê |
int drag_x, drag_y; |
int old_end_x, old_end_y; |
138,19 → 140,6 |
kos_DrawLine(x+1,y+height-1,x+width-1,y+height-1,color1,invert); |
} |
|
// edit box |
/* |
void KEdit() |
{ |
int max_char = (editbox_w) / 6; |
kos_DrawBar(editbox_x,editbox_y,editbox_w-1,editbox_h-3,0xFFFFFF); //áåëàÿ îáëàñòü |
if (strlen(edit_text)<max_char) |
kos_WriteTextToWindow(editbox_x, editbox_y+editbox_h / 2-5,0x80,0,edit_text,0); //editbox_h/2+ âìåñòî +3 |
else |
kos_WriteTextToWindow(editbox_x, editbox_y+editbox_h / 2-5,0x80,0,edit_text+strlen(edit_text)-max_char+1,0); //text 'path' |
} |
*/ |
|
void start_edit(int x, int y) |
{ |
|
206,8 → 195,6 |
//memset((Byte*)edit_text,0, 256); |
calculate_values(); |
} |
else |
return; |
} |
|
void cancel_edit() |
806,11 → 793,25 |
kos_GetMouseState(mouse_btn, mouse_x, mouse_y); |
mouse_x -= 5; |
mouse_y -= kos_GetSkinHeight(); |
|
mouse_btn &= 0x0001; |
|
ckeys = kos_GetSpecialKeyState(); |
shift = ckeys & 0x3; |
|
if (mouse_y < 0 && mouse_btn) // ò.ê. ìûøêà íà çàãîëîâêå îêíà |
{ |
window_is_dragged = 1; |
return; |
} |
if (window_is_dragged) |
{ |
if (mouse_btn) |
return; |
else |
window_is_dragged = 0; |
} |
|
if (!size_state && !mouse_btn) |
return; |
if (mouse_btn && !size_state) // LMB down |
879,7 → 880,7 |
if (!shift) |
{ |
move_sel(kx, ky); |
return; |
//return; |
} |
else |
{ |
906,7 → 907,7 |
fill_cells(sel_x, sel_y, sel_end_x, sel_end_y, old_end_x, old_end_y); |
} |
|
sel_moved = (size_state == SIZE_SELECT && sel_x == sel_end_x && sel_y == sel_end_y && was_single_selection); |
//sel_moved = (size_state == SIZE_SELECT && sel_x == sel_end_x && sel_y == sel_end_y && was_single_selection); |
size_state = 0; |
draw_window(); // âñå ñäâèíóëîñü - íàäî îáíîâèòüñÿ |
return; |
1239,10 → 1240,7 |
//stop_edit(); |
//draw_grid(); |
} |
else |
{ |
} |
} |
/* |
if (sel_end_x < sel_x) |
{ |
1427,24 → 1425,6 |
kos_WriteTextToWindow(320, panel_y,0,0x000000,(char*)er_format,strlen(er_format)); |
break; |
} |
/* |
if (button >= COL_BUTTON && button < ROW_BUTTON) |
{ |
scroll_x = button - COL_BUTTON; |
fn_edit = is_edit = 0; |
draw_window(); |
//sprintf(debuf, "col %U", scroll_x); |
//rtlDebugOutString(debuf); |
} |
else if (button >= ROW_BUTTON && button < COL_HEAD_BUTTON) |
{ |
scroll_y = button - ROW_BUTTON; |
fn_edit = is_edit = 0; |
draw_window(); |
//sprintf(debuf, "row %U", scroll_y); |
//rtlDebugOutString(debuf); |
} |
*/ |
if (button >= COL_HEAD_BUTTON && button < ROW_HEAD_BUTTON) |
{ |
sel_end_x = sel_x = button - COL_HEAD_BUTTON; |