Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7960 → Rev 7975

/programs/cmm/quark/search.h
63,17 → 63,17
DrawBar(0, _y+1, Form.cwidth, SEARCH_H-1, sc.work);
 
search_box.top = _y + 6;
search_box.width = math.min(Form.width - 200, 250);
search_box.width = math.min(Form.width - 200, 150);
 
DrawRectangle(search_box.left-1, search_box.top-1, search_box.width+2, 23,sc.work_graph);
 
edit_box_draw stdcall(#search_box);
 
DrawCaptButton(search_box.left+search_box.width+14, search_box.top-1, 90,
DrawCaptButton(search_box.left+search_box.width+14, search_box.top-1, 100,
TOOLBAR_ICON_HEIGHT+1, _btn_find, sc.work_light, sc.work_text, T_FIND_NEXT);
 
sprintf(#matches, T_MATCHES, found.count);
WriteTextWithBg(search_box.left+search_box.width+14+110,
WriteTextWithBg(search_box.left+search_box.width+14+115,
search_box.top+3, 0xD0, sc.work_text, #matches, sc.work);
 
DefineHiddenButton(Form.cwidth-26, search_box.top-1, TOOLBAR_ICON_HEIGHT+1,
97,17 → 97,22
int SEARCH::find_next(int _cur_pos)
{
int i;
dword t1, t2;
if (!search_text[0]) return false;
 
if (!streq(#found_text, #search_text)) {
strcpy(#found_text, #search_text);
find_all();
draw_window();
}
draw_window();
 
//for (i=_cur_pos+1; i<list.count; i++) {
// if (strstri(lines.get(i),#search_text)) return i;
//}
for (i=0; i<found.count; i++) {
if (signed found.get(i) - lines.get(_cur_pos) > 0) {
t1 = found.get(i);
while(t1 > lines.get(_cur_pos)) _cur_pos++;
return _cur_pos-1;
}
}
return false;
}