Skip to content

Commit

Permalink
1.1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
YrracOwl committed Jan 29, 2024
1 parent 4bbdf3f commit 9d26607
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion default.aproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.1.1.02" ProductVersion="1.1.1.02" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.1.1.03" ProductVersion="1.1.1.03" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
<file name="chiikawa.png" path="res\chiikawa.png" comment="res\chiikawa.png"/>
Expand Down
28 changes: 17 additions & 11 deletions dlg/note_for_app.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ win.ui.simpleWindow(appNotesWin,,,,).skin(
);

appNotesWin.exeName = "SHIFT";
appNotesWin.posChanged = false;

appNotesWin.updateNote = function(exeName){
appNotesWin.exeName = exeName;
Expand All @@ -48,12 +49,14 @@ appNotesWin.updateNote = function(exeName){
}

appNotesWin.onClose = function(hwnd,message,wParam,lParam){
appNotesWin.savePos();
appNotesWin.show(false);
return false;
}

appNotesWin.saveData = function(){
if(!appNotesWin.noteArea.readonly){
appNotesWin.show(true);
var ok = appNotesWin.msgboxTest("是否保存笔记?","保存笔记");
if(ok){
appNotesWin.保存.oncommand();
Expand All @@ -62,15 +65,18 @@ appNotesWin.saveData = function(){
}

appNotesWin.savePos = function(){
var xx1,yy1,xwidth1,yheight1 = win.getPos(appNotesWin.hwnd,true);
var cmd1 = ..dbAppNotes.prepare("REPLACE INTO [appNotesPos] VALUES (@name,@xx,@yy,@xwidth,@yheight);" );
cmd1.step(
name = appNotesWin.exeName;
xx = xx1;
yy = yy1;
xwidth = xwidth1;
yheight = yheight1;
);
if(appNotesWin.posChanged){
var xx1,yy1,xwidth1,yheight1 = win.getPos(appNotesWin.hwnd,true);
var cmd1 = ..dbAppNotes.prepare("REPLACE INTO [appNotesPos] VALUES (@name,@xx,@yy,@xwidth,@yheight);" );
cmd1.step(
name = appNotesWin.exeName;
xx = xx1;
yy = yy1;
xwidth = xwidth1;
yheight = yheight1;
);
appNotesWin.posChanged = false;
}
}


Expand Down Expand Up @@ -112,15 +118,15 @@ appNotesWin.保存.oncommand = function(id,event){
appNotesWin.wndproc = function(hwnd,message,wParam,lParam){
select( message ) {
case 0x47/*_WM_WINDOWPOSCHANGED*/{
appNotesWin.savePos();
appNotesWin.posChanged = true;
}
else{
}
}
//无返回值则继续调用默认回调函数
}

appNotesWin.enableDpiScaling();
//appNotesWin.enableDpiScaling();
appNotesWin.show();
win.loopMessage();
return appNotesWin;
1 change: 0 additions & 1 deletion dlg/webwatcher.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ if(..cfg.apps_setting.启动时监控应用){
winform.关闭所有笔记.oncommand = function(id,event){
if(appNoteWinForm){
for(k,v in appNoteWinForm){
v.show(true)
v.forceClose();
}
appNoteWinForm = {};
Expand Down
1 change: 0 additions & 1 deletion release/1.1.1.1

This file was deleted.

1 change: 1 addition & 0 deletions release/1.1.1.2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.1.1.2
Binary file modified release/ChiikawaBest.exe
Binary file not shown.

0 comments on commit 9d26607

Please sign in to comment.