マウスジェスチャーのAV対策

diff --git a/Giko.dfm b/Giko.dfm
index 296401b..77834b7 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 159
-  Top = 226
+  Left = 364
+  Top = 51
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -16,6 +16,7 @@ object GikoForm: TGikoForm
   KeyPreview = True
   OldCreateOrder = False
   Visible = True
+  OnActivate = FormActivate
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -301,6 +302,7 @@ object GikoForm: TGikoForm
             Width = 704
             Height = 165
             Align = alClient
+            AllocBy = 2
             Columns = <>
             DragMode = dmAutomatic
             HideSelection = False
@@ -313,15 +315,14 @@ object GikoForm: TGikoForm
             StateImages = StateIconImageList
             TabOrder = 0
             ViewStyle = vsReport
-            OnAdvancedCustomDrawItem = ListViewAdvancedCustomDrawItem
             OnColumnClick = ListViewColumnClick
             OnColumnRightClick = ListViewColumnRightClick
             OnCustomDraw = ListViewCustomDraw
+            OnCustomDrawItem = ListViewCustomDrawItem
             OnData = ListViewData
             OnDataFind = ListViewDataFind
             OnDataHint = ListViewDataHint
             OnDataStateChange = ListViewDataStateChange
-            OnExit = ListViewExit
             OnKeyDown = ListViewKeyDown
             OnMouseDown = ListViewMouseDown
             OnSelectItem = ListViewSelectItem
@@ -561,7 +562,7 @@ object GikoForm: TGikoForm
             BevelOuter = bvNone
             UseDockManager = False
             TabOrder = 2
-            OnCanResize = BrowserPanelCanResize
+            OnResize = BrowserPanelResize
             object Browser: TWebBrowser
               Left = 0
               Top = 0

diff --git a/Giko.pas b/Giko.pas
index 4c50bbb..a4d7da9 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -606,9 +606,6 @@ type
                procedure BrowserBeforeNavigate2(Sender: TObject;
                        const pDisp: IDispatch; var URL, Flags, TargetFrameName, PostData,
                        Headers: OleVariant; var Cancel: WordBool);
-               procedure ListViewAdvancedCustomDrawItem(Sender: TCustomListView;
-                       Item: TListItem; State: TCustomDrawState; Stage: TCustomDrawStage;
-                       var DefaultDraw: Boolean);
                procedure TreeViewCustomDraw(Sender: TCustomTreeView;
                        const ARect: TRect; var DefaultDraw: Boolean);
                procedure TreeViewCustomDrawItem(Sender: TCustomTreeView;
@@ -899,7 +896,6 @@ type
        procedure BrowserMaxAndFocusActionExecute(Sender: TObject);
     procedure BrowserMaxAndFocusActionUpdate(Sender: TObject);
     procedure ThreadlistMaxAndFocusActionExecute(Sender: TObject);
-    procedure ListViewExit(Sender: TObject);
     procedure SetFocusForCabinetActionUpdate(Sender: TObject);
     procedure ListViewSelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
@@ -908,8 +904,6 @@ type
     procedure KidokuActionExecute(Sender: TObject);
     procedure MidokuActionExecute(Sender: TObject);
     procedure SelectItemSaveForDatExecute(Sender: TObject);
-    procedure BrowserPanelCanResize(Sender: TObject; var NewWidth,
-      NewHeight: Integer; var Resize: Boolean);
     procedure LogFolderOpenActionExecute(Sender: TObject);
     procedure LogFolderOpenActionUpdate(Sender: TObject);
                procedure TabsSaveActionExecute(Sender: TObject);
@@ -931,6 +925,10 @@ type
     procedure JumpToNumOfResActionExecute(Sender: TObject);
     procedure JumpToNumOfResActionUpdate(Sender: TObject);
     procedure FavoriteTreeViewCollapseActionExecute(Sender: TObject);
+    procedure BrowserPanelResize(Sender: TObject);
+    procedure ListViewCustomDrawItem(Sender: TCustomListView;
+      Item: TListItem; State: TCustomDrawState; var DefaultDraw: Boolean);
+    procedure FormActivate(Sender: TObject);
        private
                { Private \90é\8c¾ }
         //RoundList : TRoundList;
@@ -1300,10 +1298,10 @@ begin
        Writeln('============================================================');
 {$ENDIF}
        FStartUp := false;
-       Application.OnDeactivate := AppFormDeactivate;
+       //Application.OnDeactivate := AppFormDeactivate;
        Self.OnDeactivate := AppFormDeactivate;
        Application.HookMainWindow(Hook);
-       Application.OnMessage := HandleAppMessage; //\82È\82ñ\82©\96³\82­\82Ä\82à\91å\8fä\95v\82É\82È\82Á\82½\81@by\81@\82à\82¶\82ã
+//     Application.OnMessage := HandleAppMessage; //\82È\82ñ\82©\96³\82­\82Ä\82à\91å\8fä\95v\82É\82È\82Á\82½\81@by\81@\82à\82¶\82ã
        FTreeType := gttNone;
 
        FSearchDialog := nil;
@@ -1733,7 +1731,7 @@ begin
                        if FileExists(GikoSys.GetConfigDir + 'language.ini') then
                                GikoSys.Setting.Gengo.LoadFromFile(GikoSys.GetConfigDir + 'language.ini')
                        else
-               GikoSys.Setting.GengoSupport := false;
+                               GikoSys.Setting.GengoSupport := false;
                end;
 end;
 
@@ -2580,7 +2578,6 @@ begin
                end;
 
                Item.ImageIndex := ITEM_ICON_BOARD1;
-
                idx := 0;
                for i := 0 to ListView.Columns.Count - 1 do begin
                        if GikoSys.Setting.CategoryColumnOrder.Count <= i then
@@ -2731,11 +2728,12 @@ begin
                                end;
                                Inc( idx );
                        end;
-
                        if ThreadItem.NewArrival then
                                Item.ImageIndex := ITEM_ICON_THREADNEW1
                        else
                                Item.ImageIndex := ITEM_ICON_THREADLOG1;
+
+
                end else begin
                        idx := 0;
                        for i := 0 to GikoSys.Setting.BoardColumnOrder.Count - 1 do begin
@@ -2765,13 +2763,11 @@ begin
                                end;
                                Inc( idx );
                        end;
-
                        if ThreadItem.NewArrival then
                                Item.ImageIndex := ITEM_ICON_THREADNEW1
                        else
                                Item.ImageIndex := ITEM_ICON_THREAD1;
                end;
-
                Item.Data := ThreadItem;
 
        end;
@@ -3148,7 +3144,7 @@ begin
        if FSortIndex = id then
                FSortOrder := not FSortOrder
        else
-               FSortOrder := False;
+               FSortOrder := true;
 
        ListViewSort(Sender, Column);
 end;
@@ -3276,26 +3272,6 @@ begin
 
 end;
 
-procedure TGikoForm.ListViewAdvancedCustomDrawItem(Sender: TCustomListView;
-       Item: TListItem; State: TCustomDrawState; Stage: TCustomDrawStage;
-       var DefaultDraw: Boolean);
-var
-       ThreadItem: TThreadItem;
-begin
-//     TListView(Sender).Canvas.Font.Style := [];
-       if TObject(Item.Data) is TThreadItem then begin
-               ThreadItem := TThreadItem(Item.Data);
-               if ( FUseOddResOddColor ) and ( ThreadItem.Count <> 0 ) and ( ThreadItem.AllResCount <> ThreadItem.Count) then begin
-                       ListView.Canvas.Brush.Color := FOddColor;
-               end else begin
-                       ListView.Canvas.Brush.Color := FListViewBackGroundColor;
-               end;
-//             if (ThreadItem.Kokomade <> ThreadItem.Count) and (ThreadItem.IsLogFile) then
-               if ThreadItem.UnRead then
-                       TListView(Sender).Canvas.Font.Style := [fsBold];
-       end;
-end;
-
 procedure TGikoForm.AppFormDeactivate(Sender: TObject);
 begin
     Application.ProcessMessages;
@@ -4039,7 +4015,7 @@ var
 //     Board: TBoard;
 begin
        if ListView.Items.Count = 0 then begin
-               DefaultDraw := True;
+               DefaultDraw := true;
 
                ListView.Canvas.Brush.Color := ListView.Color;
                ListView.Canvas.FillRect(ARect);
@@ -10723,7 +10699,7 @@ begin
                TreeDoubleClick( TreeView.Selected );
        end else if Key = VK_RETURN then begin
                TreeClick( TreeView.Selected );
-        TreeView.Selected.Expanded := not TreeView.Selected.Expanded;
+               TreeView.Selected.Expanded := not TreeView.Selected.Expanded;
        end;
 end;
 
@@ -10999,12 +10975,6 @@ begin
        SetFocusForThreadListAction.Execute;
 end;
 
-procedure TGikoForm.ListViewExit(Sender: TObject);
-begin
-       ListView.Repaint;
-end;
-
-
 procedure TGikoForm.ListViewSelectItem(Sender: TObject; Item: TListItem;
   Selected: Boolean);
 begin
@@ -11221,17 +11191,6 @@ begin
        end;
 end;
 
-procedure TGikoForm.BrowserPanelCanResize(Sender: TObject; var NewWidth,
-  NewHeight: Integer; var Resize: Boolean);
-var
-       i: Integer;
-begin
-       for i := BROWSER_COUNT - 1 downto 0 do begin
-               SetWindowPos(TWebBrowser(FBrowsers[i]).Handle, HWND_NOTOPMOST, 0, 0, NewWidth, NewHeight, SWP_NOACTIVATE + SWP_NOCOPYBITS + SWP_NOREDRAW + SWP_NOMOVE + SWP_NOZORDER);
-       end;
-
-end;
-
 procedure TGikoForm.LogFolderOpenActionExecute(Sender: TObject);
 var
        List: TList;
@@ -11860,6 +11819,46 @@ begin
        StatusBar.Panels[1].Text := '';
 end;
 
+procedure TGikoForm.BrowserPanelResize(Sender: TObject);
+var
+       i: Integer;
+begin
+       for i := FBrowsers.Count - 1 downto 0 do begin
+               if FBrowsers[i] <> nil then
+                       SetWindowPos(TWebBrowser(FBrowsers[i]).Handle, HWND_NOTOPMOST, 0, 0, BrowserPanel.Width, BrowserPanel.Height, SWP_NOMOVE + SWP_NOZORDER);
+       end;
+
+end;
+
+procedure TGikoForm.ListViewCustomDrawItem(Sender: TCustomListView;
+  Item: TListItem; State: TCustomDrawState; var DefaultDraw: Boolean);
+var
+       ThreadItem: TThreadItem;
+begin
+    DefaultDraw := true;
+       if TObject(Item.Data) is TThreadItem then begin
+               ThreadItem := TThreadItem(Item.Data);
+               if ( FUseOddResOddColor ) and ( ThreadItem.Count <> 0 ) and ( ThreadItem.AllResCount <> ThreadItem.Count) then begin
+                       ListView.Canvas.Brush.Color := FOddColor;
+               end else begin
+                       ListView.Canvas.Brush.Color := FListViewBackGroundColor;
+               end;
+//             if (ThreadItem.Kokomade <> ThreadItem.Count) and (ThreadItem.IsLogFile) then
+               if ThreadItem.UnRead then
+                       TListView(Sender).Canvas.Font.Style := [fsBold];
+       end;
+
+end;
+
+procedure TGikoForm.FormActivate(Sender: TObject);
+begin
+       MouseGesture.UnHook;
+       MouseGesture.OnGestureStart := OnGestureStart;
+       MouseGesture.OnGestureMove := OnGestureMove;
+       MouseGesture.OnGestureEnd := OnGestureEnd;
+       MouseGesture.SetHook(Handle);
+end;
+
 initialization
                                OleInitialize(nil);
 finalization