2
0
Эх сурвалжийг харах

using DropDownMenu property

Unknown 6 жил өмнө
parent
commit
6f3cd956f0

+ 4 - 4
vectoredit/umain.lfm

@@ -835,19 +835,19 @@ object Form1: TForm1
           StateNormal.FontEx.WordBreak = False
           StateNormal.FontEx.WordBreak = False
           Color = clNone
           Color = clNone
           DropDownWidth = 16
           DropDownWidth = 16
-          DropDownArrowSize = 8
+          DropDownArrowSize = 6
           GlobalOpacity = 255
           GlobalOpacity = 255
           InnerMargin = 0
           InnerMargin = 0
-          OnClick = ButtonPenStyleClick
           ParentColor = False
           ParentColor = False
-          Rounding.RoundX = 5
-          Rounding.RoundY = 5
+          Rounding.RoundX = 6
+          Rounding.RoundY = 6
           Rounding.RoundOptions = []
           Rounding.RoundOptions = []
           RoundingDropDown.RoundX = 1
           RoundingDropDown.RoundX = 1
           RoundingDropDown.RoundY = 1
           RoundingDropDown.RoundY = 1
           RoundingDropDown.RoundOptions = []
           RoundingDropDown.RoundOptions = []
           ShowHint = True
           ShowHint = True
           TextApplyGlobalOpacity = False
           TextApplyGlobalOpacity = False
+          DropDownArrow = True
           DropDownStyle = bdsCommon
           DropDownStyle = bdsCommon
           MemoryUsage = bmuHigh
           MemoryUsage = bmuHigh
         end
         end

+ 4 - 8
vectoredit/umain.pas

@@ -116,7 +116,6 @@ type
     procedure BCPanelToolChoiceResize(Sender: TObject);
     procedure BCPanelToolChoiceResize(Sender: TObject);
     procedure BGRAVirtualScreen1MouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
     procedure BGRAVirtualScreen1MouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
       WheelDelta: Integer; {%H-}MousePos: TPoint; var {%H-}Handled: Boolean);
       WheelDelta: Integer; {%H-}MousePos: TPoint; var {%H-}Handled: Boolean);
-    procedure ButtonPenStyleClick(Sender: TObject);
     procedure EditCopyExecute(Sender: TObject);
     procedure EditCopyExecute(Sender: TObject);
     procedure EditCutExecute(Sender: TObject);
     procedure EditCutExecute(Sender: TObject);
     procedure EditDeleteExecute(Sender: TObject);
     procedure EditDeleteExecute(Sender: TObject);
@@ -346,6 +345,7 @@ begin
     item.OnClick := @OnClickPenStyle;       item.Tag := ord(ps);
     item.OnClick := @OnClickPenStyle;       item.Tag := ord(ps);
     FPenStyleMenu.Items.Add(item);
     FPenStyleMenu.Items.Add(item);
   end;
   end;
+  ButtonPenStyle.DropDownMenu := FPenStyleMenu;
 
 
   PenFillControl.ToolIconSize:= ActionIconSize;
   PenFillControl.ToolIconSize:= ActionIconSize;
   PenFillControl.SolidColor := BGRABlack;
   PenFillControl.SolidColor := BGRABlack;
@@ -600,13 +600,6 @@ begin
   PanelShape.Width := ToolBarEdit.Width+3;
   PanelShape.Width := ToolBarEdit.Width+3;
 end;
 end;
 
 
-procedure TForm1.ButtonPenStyleClick(Sender: TObject);
-begin
-  if Assigned(FPenStyleMenu) then
-    with ButtonPenStyle.ClientToScreen(Point(0,ButtonPenStyle.Height)) do
-      FPenStyleMenu.PopUp(X,Y);
-end;
-
 procedure TForm1.BCPanelToolChoiceResize(Sender: TObject);
 procedure TForm1.BCPanelToolChoiceResize(Sender: TObject);
 begin
 begin
   ToolbarTools.Width := GetToolbarSize(ToolbarTools).cx;
   ToolbarTools.Width := GetToolbarSize(ToolbarTools).cx;
@@ -742,6 +735,7 @@ begin
   if (newShape <> nil) and not shapeAdded then FreeAndNil(newShape);
   if (newShape <> nil) and not shapeAdded then FreeAndNil(newShape);
   img.Free;
   img.Free;
   FFlattened.Free;
   FFlattened.Free;
+  ButtonPenStyle.DropDownMenu := nil;
   FPenStyleMenu.Free;
   FPenStyleMenu.Free;
   FSplineStyleMenu.Free;
   FSplineStyleMenu.Free;
 end;
 end;
@@ -1300,6 +1294,8 @@ begin
     FComboboxSplineStyle.StateHover.Assign(ButtonPenStyle.StateHover);
     FComboboxSplineStyle.StateHover.Assign(ButtonPenStyle.StateHover);
     FComboboxSplineStyle.StateClicked.Assign(ButtonPenStyle.StateClicked);
     FComboboxSplineStyle.StateClicked.Assign(ButtonPenStyle.StateClicked);
     FComboboxSplineStyle.Rounding.Assign(ButtonPenStyle.Rounding);
     FComboboxSplineStyle.Rounding.Assign(ButtonPenStyle.Rounding);
+    FComboboxSplineStyle.DropDownArrow:= ButtonPenStyle.DropDownArrow;
+    FComboboxSplineStyle.DropDownArrowSize:= ButtonPenStyle.DropDownArrowSize;
     AddToolbarControl(FSplineToolbar, FComboboxSplineStyle);
     AddToolbarControl(FSplineToolbar, FComboboxSplineStyle);
 
 
     UpdateSplineToolbar;
     UpdateSplineToolbar;