v1.07.0。合言葉のエラーメッセージの非同期化。ChickenPaint、NEO更新。描画時に円カーソルが表示されたままになるようにした。

satopian · Dec 22, 2023 · f16a368 · f16a368
1 parent 60944c4
commit f16a368
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/petitnote/app/chickenpaint/js/chickenpaint.js b/petitnote/app/chickenpaint/js/chickenpaint.js
@@ -19168,7 +19168,7 @@ function CPCanvas(controller) {
   CPDrawingMode.prototype.suspend = CPDrawingMode.prototype.leave;
   CPDrawingMode.prototype.resume = CPDrawingMode.prototype.enter;
   CPDrawingMode.prototype.paint = function () {
-    if (this.shouldPaintBrushPreview) {
+    // if (this.shouldPaintBrushPreview) {
       this.shouldPaintBrushPreview = false;
       var r = this.getBrushPreviewOval();
       canvasContext.beginPath();
@@ -19180,7 +19180,7 @@ function CPCanvas(controller) {
       } else {
         this.oldPreviewRect.union(r);
       }
-    }
+    // }
   };
   function CPFreehandMode() {
     CPDrawingMode.call(this);

diff --git a/petitnote/app/chickenpaint/js/chickenpaint.min.js b/petitnote/app/chickenpaint/js/chickenpaint.min.js
diff --git a/petitnote/app/neo/neo.js b/petitnote/app/neo/neo.js
@@ -4812,6 +4812,7 @@ Neo.DrawToolBase.prototype.freeHandDownHandler = function (oe) {
     var rect = oe.getBound(oe.mouseX, oe.mouseY, oe.mouseX, oe.mouseY, r);
     oe.updateDestCanvas(rect[0], rect[1], rect[2], rect[3], true);
   }
+  this.drawCursor(oe);
 };
 
 Neo.DrawToolBase.prototype.freeHandUpHandler = function (oe) {
@@ -4846,6 +4847,7 @@ Neo.DrawToolBase.prototype.freeHandMoveHandler = function (oe) {
   var r = Math.ceil(oe.lineWidth / 2);
   var rect = oe.getBound(oe.mouseX, oe.mouseY, oe.prevMouseX, oe.prevMouseY, r);
   oe.updateDestCanvas(rect[0], rect[1], rect[2], rect[3], true);
+  this.drawCursor(oe);
 };
 
 Neo.DrawToolBase.prototype.freeHandUpMoveHandler = function (oe) {
@@ -4860,11 +4862,11 @@ Neo.DrawToolBase.prototype.freeHandUpMoveHandler = function (oe) {
 };
 
 Neo.DrawToolBase.prototype.drawCursor = function (oe) {
-  if (oe.lineWidth <= 8) return;
-  var mx = oe.mouseX;
+// if (oe.lineWidth <= 8) return;//オリジナルは8px以下のときは円カーソルを出さない
+var mx = oe.mouseX;
   var my = oe.mouseY;
   var d = oe.lineWidth;
-
+  d = (d==1) ? 2 : d;//1pxの時は2px相当の円カーソルを表示
   var x = (mx - oe.zoomX + (oe.destCanvas.width * 0.5) / oe.zoom) * oe.zoom;
   var y = (my - oe.zoomY + (oe.destCanvas.height * 0.5) / oe.zoom) * oe.zoom;
   var r = d * 0.5 * oe.zoom;

diff --git a/petitnote/index.php b/petitnote/index.php
@@ -1,8 +1,8 @@
 <?php
 //Petit Note (c)さとぴあ @satopian 2021-2023
 //1スレッド1ログファイル形式のスレッド式画像掲示板
-$petit_ver='v1.06.2';
-$petit_lot='lot.20231219';
+$petit_ver='v1.07.0';
+$petit_lot='lot.20231222';
 $lang = ($http_langs = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : '')
   ? explode( ',', $http_langs )[0] : '';
 $en= (stripos($lang,'ja')!==0);