瀏覽代碼

fix color dialog for qt5

Johann ELSASS 4 年之前
父節點
當前提交
cd66f028b5
共有 3 個文件被更改,包括 3 次插入5 次删除
  1. 1 1
      lazpaint/dialog/uobject3d.lfm
  2. 2 2
      lazpaint/dialog/uobject3d.pas
  3. 0 2
      lazpaint/maintoolbar.inc

+ 1 - 1
lazpaint/dialog/uobject3d.lfm

@@ -240,7 +240,7 @@ object FObject3D: TFObject3D
           Top = 28
           Width = 20
           Enabled = False
-          OnMouseDown = Shape_MaterialColorMouseDown
+          OnMouseUp = Shape_MaterialColorMouseUp
         end
         object SpinEdit_SpecularIndex: TSpinEdit
           Left = 90

+ 2 - 2
lazpaint/dialog/uobject3d.pas

@@ -116,7 +116,7 @@ type
     procedure PaintBox_LightPosPaint(Sender: TObject);
     procedure Shape_LightColorMouseUp(Sender: TObject; {%H-}Button: TMouseButton;
       {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
-    procedure Shape_MaterialColorMouseDown(Sender: TObject;
+    procedure Shape_MaterialColorMouseUp(Sender: TObject;
       {%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
     procedure SpinEdit_ColorOpacityChange(Sender: TObject);
     procedure SpinEdit_ColorOpacityKeyPress(Sender: TObject; var Key: char);
@@ -638,7 +638,7 @@ begin
   end;
 end;
 
-procedure TFObject3D.Shape_MaterialColorMouseDown(Sender: TObject;
+procedure TFObject3D.Shape_MaterialColorMouseUp(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   if materialIndex <> -1 then

+ 0 - 2
lazpaint/maintoolbar.inc

@@ -1097,8 +1097,6 @@ begin
   else exit;
 
   AHandled := true;
-  if (ToolWindowStyle <> fsStayOnTop) and
-     (AButton = mbLeft) then LazPaintInstance.ChooseColorVisible := true;
   if LazPaintInstance.ChooseColorVisible and (AButton = mbLeft) then
     LazPaintInstance.ChooseColorTarget := target
   else