1,12 → 1,19 |
//ñâîåâðåìåííîå ðåàãèðîâàíèå íà ñîáûòèÿ ìûøè |
//ìèíèìàëüíûå ðàçìåðû îêíà |
//óáðàíà ïåðåðèñîâêà çàãîëîâêà îêíà òàì, ãäå îíà íå íóæíà |
//óáðàíî "çàïîëçàíèå" ïàíåëè ñíèçó íà ãðàíèöû îêíà |
//èñïðàâëåí áàã èç-çà êîòîðîãî ïîñëå äåéñòâèé ìûøêîé óäàëÿëàñü êíîïêà çàêðûòèÿ îêíà |
|
//çà÷åì ñòðîêà 450? |
//åñëè âûäåëèòü îáëàñòü ÿ÷ååê è ñäâèíóòü êóðñîð ââîäà ñ ïîìîùüþ êëàâèø, "ñëåäû" îñòàíóòüñÿ |
//íåëüçÿ ïåðåìåùàòüñÿ ïî áóêâàì â ðåäàêòèðóåìîé ñòðîêå |
|
#include "func.h" |
#include "parser.h" |
#include "calc.h" |
#include "use_library.h" |
///#include "use_library.h" |
//const char header[] = "Table"; |
|
#define TABLE_VERSION "0.95" |
#define TABLE_VERSION "0.96" |
|
// ñòðîêè, êîòîðûå âûâîäèò ïðîãðàììà |
const char *sFileSign = "KolibriTable File\n"; |
102,6 → 109,7 |
// ôëàã |
bool sel_moved = 0; |
bool sel_end_move = 0; |
bool window_drawall = false; |
// ñêîëüêî ÿ÷ååê ïîìåùàåòñÿ â îêíå ïî õ è ó |
DWORD nx = 0, ny = 0; |
|
583,8 → 591,6 |
{ |
//rtlDebugOutString("draw size grid"); |
|
kos_WindowRedrawStatus(1); |
|
if (size_state == SIZE_X) |
{ |
int x, x0, i; |
624,8 → 630,6 |
kos_DrawLine(0, y - y0, wi, y - y0, 0, 1); |
} |
|
|
kos_WindowRedrawStatus(2); |
} |
|
|
635,8 → 639,6 |
#define DINVERT 1 |
void draw_drag() |
{ |
kos_WindowRedrawStatus(1); |
|
// ñîáñòâåííî, 4 èíâåðñíûå ëèíèè |
|
int k0 = min(sel_x, sel_end_x); |
660,8 → 662,6 |
kos_DrawLine(x0, y0, x1, y0, DCOLOR, DINVERT); |
kos_DrawLine(x1, y0, x1, y1, DCOLOR, DINVERT); |
kos_DrawLine(x0, y1, x1, y1, DCOLOR, DINVERT); |
|
kos_WindowRedrawStatus(2); |
} |
|
void draw_window() |
692,30 → 692,32 |
he = WND_H; |
|
he -= kos_GetSkinHeight() + MENU_PANEL_HEIGHT; // äîñòóïíàÿ âûñîòà îêíà |
wi -= 6 + 4; |
wi -= 10; |
|
//Leency{ |
// start redraw |
if (window_drawall==true){ |
kos_WindowRedrawStatus(1); |
|
kos_DefineAndDrawWindow(10,40,WND_W,WND_H,0x33,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION); |
|
if (he + MENU_PANEL_HEIGHT <= 8) |
if (he + MENU_PANEL_HEIGHT <= 8) //åñëè îêíî ñâ¸ðíóòî â çàãîëîâîê |
{ |
kos_WindowRedrawStatus(2); |
return; |
} |
|
if (!sel_moved) |
{ |
kos_DrawBar(wi-15,he - kos_GetSkinHeight() +7,16,16,0xe4dfe1); |
kos_DrawBar(0,he - kos_GetSkinHeight() + 23,wi + 1,MENU_PANEL_HEIGHT-4,0xe4dfe1); |
} |
if (he < 100) kos_ChangeWindow( -1, -1, -1, 180 ); |
if (wi < 340) kos_ChangeWindow( -1, -1, 350, -1 ); |
|
}//}Leency |
|
// edit_box_draw((dword)&ebox); |
int y = he + kos_GetSkinHeight() - 10; |
|
if (!sel_moved) |
{ |
kos_DrawBar(wi-15,he - kos_GetSkinHeight() +7,16,16,0xe4dfe1); |
kos_DrawBar(0,he - kos_GetSkinHeight() + 23,wi + 1,MENU_PANEL_HEIGHT-5,0xe4dfe1); |
kos_WriteTextToWindow(3 + 1, y + 3, 0x80 , 0x000000, (char*)sFilename, strlen(sFilename)); |
} |
|
729,9 → 731,7 |
file_box.top = y - 1; |
file_box.width = 98; |
//editbox_h = 18; |
//kos_DefineButton(62, y + 3, 100, 16, 0x60000000+FILENAME_BUTTON, 0xd0d0d0); |
|
|
// ñîõðàíèòü |
kos_DefineButton(20 + 160, y - 5, 60, 20, SAVE_BUTTON, 0xd0d0d0); |
kos_WriteTextToWindow(22 + 160 + (60 - strlen(sSave) * 6) / 2, y + 2, 0, 0x000000, (char*)sSave, strlen(sSave)); |
747,7 → 747,6 |
*/ |
panel_y = y; |
|
draw_grid(); |
//kos_DefineButton(0,0,WND_W,WND_H,0x60000002,0); |
//if (is_edit) KEdit(); |
|
758,8 → 757,10 |
edit_box_draw((DWORD)&file_box); |
} |
|
draw_grid(); |
// end redraw |
kos_WindowRedrawStatus(2); |
window_drawall=false; |
sel_moved = 0; |
} |
|
940,8 → 941,8 |
if (mouse_x >= col_left[i] && |
mouse_x <= col_left[i + 1]) |
{ |
sprintf(debuf, "yyy %U",col_left[i+1]); |
rtlDebugOutString(debuf); |
//sprintf(debuf, "yyy %U",col_left[i+1]); |
//rtlDebugOutString(debuf); |
kx = i; break; |
} |
int ky = -1; |
1450,17 → 1451,17 |
{ |
kos_InitHeap(); |
load_edit_box(); |
init(); |
|
init(); |
draw_window(); |
for (;;) |
{ |
switch (kos_WaitForEvent(10)) // äà, ïëîõî. ïîòîì íóæíî áóäåò ïðîñòî ëîâèòü ñîáûòèÿ ìûøè. |
switch (kos_CheckForEvent()) |
{ |
case 0: |
process_mouse(); |
break; |
case 1: |
window_drawall=true; |
draw_window(); |
break; |
case 2: |