@@ -70,6 +70,11 @@ export default class ScreenShort {
7070
7171 // 鼠标点击状态
7272 private clickFlag = false ;
73+ // 鼠标拖动状态
74+ private dragFlag = false ;
75+ // 上一个裁剪框坐标信息
76+ private drawGraphPrevX = 0 ;
77+ private drawGraphPrevY = 0 ;
7378 private fontSize = 17 ;
7479 // 最大可撤销次数
7580 private maxUndoNum = 15 ;
@@ -422,6 +427,9 @@ export default class ScreenShort {
422427 this . movePosition . moveStartX = mouseX ;
423428 this . movePosition . moveStartY = mouseY ;
424429 } else {
430+ // 保存当前裁剪框的坐标
431+ this . drawGraphPrevX = this . drawGraphPosition . startX ;
432+ this . drawGraphPrevY = this . drawGraphPosition . startY ;
425433 // 绘制裁剪框,记录当前鼠标开始坐标
426434 this . drawGraphPosition . startX = mouseX ;
427435 this . drawGraphPosition . startY = mouseY ;
@@ -436,6 +444,11 @@ export default class ScreenShort {
436444 this . data . getToolName ( ) == "undo"
437445 )
438446 return ;
447+
448+ // 工具栏未选择且鼠标处于按下状态时, 修改拖动状态为true
449+ if ( ! this . data . getToolClickStatus ( ) && this . data . getDragging ( ) ) {
450+ this . dragFlag = true ;
451+ }
439452 this . clickFlag = false ;
440453 // 获取裁剪框位置信息
441454 const { startX, startY, width, height } = this . drawGraphPosition ;
@@ -546,6 +559,17 @@ export default class ScreenShort {
546559 // 绘制结束
547560 this . data . setDragging ( false ) ;
548561 this . data . setDraggingTrim ( false ) ;
562+
563+ // 鼠标尚未拖动且工具栏未选择则不修改工具栏位置
564+ if ( ! this . dragFlag && ! this . data . getToolClickStatus ( ) ) {
565+ // 复原裁剪框的坐标
566+ this . drawGraphPosition . startX = this . drawGraphPrevX ;
567+ this . drawGraphPosition . startY = this . drawGraphPrevY ;
568+ // 显示截图工具栏
569+ this . data . setToolStatus ( true ) ;
570+ return ;
571+ }
572+
549573 if ( this . screenShortController == null || this . screenShortCanvas == null ) {
550574 return ;
551575 }
@@ -571,6 +595,8 @@ export default class ScreenShort {
571595 this . screenShortController . style . cursor = "move" ;
572596 // 显示截图工具栏
573597 this . data . setToolStatus ( true ) ;
598+ // 复原拖动状态
599+ this . dragFlag = false ;
574600 if ( this . toolController != null ) {
575601 // 计算截图工具栏位置
576602 const toolLocation = calculateToolLocation (
0 commit comments