diff --git a/lib/teMenu.aardio b/lib/teMenu.aardio index 9c8e3f3..823882d 100644 --- a/lib/teMenu.aardio +++ b/lib/teMenu.aardio @@ -130,7 +130,7 @@ class TeMenu{ [9] = { tips = "txt 导出 Sqlite3"; text = '\uE612'; - font = LOGFONT(h=this.ico_size;name='iconfont'); + font = LOGFONT(h=this.ico_size+5;name='iconfont'); style = { background={}; foreground={}; @@ -144,7 +144,7 @@ class TeMenu{ [10] = { tips = "Sqlite3 导出 txt"; text = '\uE612'; - font = LOGFONT(h=this.ico_size;name='iconfont'); + font = LOGFONT(h=this.ico_size+5;name='iconfont'); style = { background={}; foreground={}; diff --git a/main.aardio b/main.aardio index ac7a132..3fbaf1f 100644 --- a/main.aardio +++ b/main.aardio @@ -10,11 +10,11 @@ import flexcell; import teUtils; import teMenu; /*DSG{{*/ -var mainForm = win.form(text="TabEditor++";right=1399;bottom=799;bgcolor=16777215) +var mainForm = win.form(text="TabEditor++";right=1399;bottom=799;bgcolor=16777215;) mainForm.add( -custom={cls="custom";text="自定义控件";left=5;top=36;right=1395;bottom=772;ah=1;aw=1;bgcolor=12639424;db=1;dl=1;dr=1;dt=1;z=2}; -plus={cls="plus";left=5;top=0;right=1395;bottom=36;bgcolor=16777215;border={left=1;top=1;right=1;color=-6250332};clipBk=false;clipch=1;dl=1;dr=1;dt=1;font=LOGFONT(h=-18);forecolor=16777215;notify=1;repeat="stretch";z=1}; -plusBottom={cls="plus";left=5;top=772;right=1395;bottom=800;align="left";textPadding={left=10;right=10};z=3} +custom={cls="custom";text="自定义控件";left=0;top=36;right=1400;bottom=800;ah=1;aw=1;bgcolor=12639424;db=1;dl=1;dr=1;dt=1;z=2;}; +plus={cls="plus";left=0;top=0;right=1400;bottom=36;bgcolor=16777215;border={left=1;top=1;right=1;color=-6250332;};clipBk=false;clipch=1;dl=1;dr=1;dt=1;font=LOGFONT(h=-18);forecolor=16777215;notify=1;repeat="stretch";z=1;}; + ) /*}}*/ @@ -260,7 +260,7 @@ g_teMenus.exportTxt = function(ctrl){ //menu-关于 g_teMenus.showAbout = function(ctrl){ return function(){ - //mainForm.g_flexcell.AboutBox(); + mainForm.g_flexcell.AboutBox(); } } @@ -406,6 +406,9 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange continue; } var currStr = v[v2]; + if(#currStr == 0 and #searchContent != 0){ + continue; + } if(!isCaseSensitive){ currStr = string.lower(currStr); searchContent = string.lower(searchContent); @@ -419,7 +422,7 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange } } else { - if(string.find(currStr, searchContent)){ + if(string.find(currStr, searchContent) or currStr == searchContent){ research_flag = true; pre_searched_row = i; pre_searched_col = i2; @@ -453,6 +456,9 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange continue; } var currStr = v[v2]; + if(#currStr == 0 and #searchContent != 0){ + continue; + } if(!isCaseSensitive){ currStr = string.lower(currStr); searchContent = string.lower(searchContent); @@ -464,7 +470,7 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange } } else { - if(string.find(currStr, searchContent)){ + if(string.find(currStr, searchContent) or currStr == searchContent){ research_flag = true; return i, i2; }