Commit: a4c33bf56d70e3a77704ccbe73211d4417fb8c15 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: a4c33bf56d70e3a77704ccbe73211d4417fb8c15 (tree)
• Time: 2007-05-27 22:11:20
• Author: h677 <h677>
• Commiter: h677

Log Message

レスポップアップ位置の中央を廃止、デフォルトを右上に変更
レスポップアップ位置の補正を強化

Change Summary

• modified: Option.dfm
• modified: Option.pas
• modified: ResPopupBrowser.pas
• modified: Setting.pas

Incremental Difference

--- a/Option.dfm
+++ b/Option.dfm
@@ -1,6 +1,6 @@
 object OptionDialog: TOptionDialog
-  Left = 290
-  Top = 147
+  Left = 417
+  Top = 435
   BorderStyle = bsDialog
   Caption = #12458#12503#12471#12519#12531
   ClientHeight = 428
@@ -953,25 +953,6 @@ object OptionDialog: TOptionDialog
     object TabSheet1: TTabSheet
       Caption = #12473#12524#12483#12489#65298
       ImageIndex = 7
-      object PopupPositionRadioGroup: TRadioGroup
-        Left = 12
-        Top = 8
-        Width = 477
-        Height = 85
-        Caption = #12524#12473#12509#12483#12503#12450#12483#12503#34920#31034'(&P)'
-        Columns = 3
-        Items.Strings = (
-          #24038#19978
-          #24038
-          #24038#19979
-          #19978
-          #20013#22830
-          #19979
-          #21491#19978
-          #21491
-          #21491#19979#65288#12487#12501#12457#12523#12488#65289)
-        TabOrder = 0
-      end
       object TabAddRadioGroup: TRadioGroup
         Left = 12
         Top = 288
@@ -984,7 +965,7 @@ object OptionDialog: TOptionDialog
           #19968#30058#26368#24460
           #29694#22312#12398#21491
           #29694#22312#12398#24038)
-        TabOrder = 3
+        TabOrder = 2
       end
       object GroupBox8: TGroupBox
         Left = 12
@@ -992,7 +973,7 @@ object OptionDialog: TOptionDialog
         Width = 477
         Height = 105
         Caption = #30011#20687#12503#12524#12499#12517#12540#12509#12483#12503#12450#12483#12503
-        TabOrder = 2
+        TabOrder = 1
         object Label14: TLabel
           Left = 12
           Top = 48
@@ -1055,7 +1036,7 @@ object OptionDialog: TOptionDialog
         Width = 477
         Height = 69
         Caption = #12524#12473#12509#12483#12503#12450#12483#12503#34920#31034#35373#23450
-        TabOrder = 1
+        TabOrder = 0
         object UnActivePopupCheckBox: TCheckBox
           Left = 12
           Top = 20
@@ -1073,6 +1054,78 @@ object OptionDialog: TOptionDialog
           TabOrder = 1
         end
       end
+      object GroupBox24: TGroupBox
+        Left = 11
+        Top = 10
+        Width = 478
+        Height = 81
+        Caption = #12524#12473#12509#12483#12503#12450#12483#12503#34920#31034'(&P)'
+        TabOrder = 3
+        object gppRightTopRB: TRadioButton
+          Left = 324
+          Top = 19
+          Width = 120
+          Height = 20
+          Caption = #21491#19978#65288#12487#12501#12457#12523#12488#65289
+          TabOrder = 0
+        end
+        object gppTopRB: TRadioButton
+          Left = 170
+          Top = 19
+          Width = 120
+          Height = 20
+          Caption = #19978
+          TabOrder = 1
+        end
+        object gppLeftTopRB: TRadioButton
+          Left = 8
+          Top = 19
+          Width = 120
+          Height = 20
+          Caption = #24038#19978
+          TabOrder = 2
+        end
+        object gppLeftRB: TRadioButton
+          Left = 8
+          Top = 39
+          Width = 120
+          Height = 20
+          Caption = #24038
+          TabOrder = 3
+        end
+        object gppRightRB: TRadioButton
+          Left = 324
+          Top = 39
+          Width = 120
+          Height = 20
+          Caption = #21491
+          TabOrder = 4
+        end
+        object gppLeftBottomRB: TRadioButton
+          Left = 8
+          Top = 59
+          Width = 120
+          Height = 20
+          Caption = #24038#19979
+          TabOrder = 5
+        end
+        object gppBottomRB: TRadioButton
+          Left = 170
+          Top = 59
+          Width = 120
+          Height = 20
+          Caption = #19979
+          TabOrder = 6
+        end
+        object gppRighBottomRB: TRadioButton
+          Left = 324
+          Top = 59
+          Width = 120
+          Height = 20
+          Caption = #21491#19979
+          TabOrder = 7
+        end
+      end
     end
     object TabSheet2: TTabSheet
       Caption = #12381#12398#20182#21205#20316#65297

--- a/Option.pas
+++ b/Option.pas
@@ -119,7 +119,6 @@ type
                 ResAnchorGroupBox: TGroupBox;
                 ResAnchorCheckBox: TCheckBox;
                 TabSheet1: TTabSheet;
-                PopupPositionRadioGroup: TRadioGroup;
 	        TabAddRadioGroup: TRadioGroup;
                 GroupBox8: TGroupBox;
                 Label14: TLabel;
@@ -211,6 +210,15 @@ type
     LoopBrowserTabsCB: TCheckBox;
     GroupBox23: TGroupBox;
     IgnoreContextCheckBox: TCheckBox;
+    GroupBox24: TGroupBox;
+    gppRightTopRB: TRadioButton;
+    gppTopRB: TRadioButton;
+    gppLeftTopRB: TRadioButton;
+    gppLeftRB: TRadioButton;
+    gppRightRB: TRadioButton;
+    gppLeftBottomRB: TRadioButton;
+    gppBottomRB: TRadioButton;
+    gppRighBottomRB: TRadioButton;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure ApplyButtonClick(Sender: TObject);
@@ -770,15 +778,15 @@ begin
 	BrowserMaxCombo.ItemIndex := Ord( GikoSys.Setting.BrowserAutoMaximize );
 	//ƒ|ƒbƒvƒAƒbƒvˆÊ’u
 	case GikoSys.Setting.PopupPosition of
-		gppRightTop: 		PopupPositionRadioGroup.ItemIndex := 0;
-		gppRight: 			PopupPositionRadioGroup.ItemIndex := 1;
-		gppRightBottom: PopupPositionRadioGroup.ItemIndex := 2;
-		gppTop: 				PopupPositionRadioGroup.ItemIndex := 3;
-		gppCenter: 			PopupPositionRadioGroup.ItemIndex := 4;
-		gppBottom: 			PopupPositionRadioGroup.ItemIndex := 5;
-		gppLeftTop: 		PopupPositionRadioGroup.ItemIndex := 6;
-		gppLeft: 				PopupPositionRadioGroup.ItemIndex := 7;
-		gppLeftBottom: 	PopupPositionRadioGroup.ItemIndex := 8;
+		gppRightTop: 		gppRightTopRB.Checked := True;
+		gppRight: 			gppRightRB.Checked := True;
+		gppRightBottom:     gppRighBottomRB.Checked := True;
+		gppTop: 			gppTopRB.Checked := True;
+		gppCenter: 			gppTopRB.Checked := True; // “ǂݍž‚Ý‚Å•ÏŠ·‚µ‚Ä‚é‚Í‚¸
+		gppBottom: 			gppBottomRB.Checked := True;
+		gppLeftTop: 		gppLeftTopRB.Checked := True;
+		gppLeft: 			gppLeftRB.Checked := True;
+		gppLeftBottom:      gppLeftBottomRB.Checked := True;
 	end;
 
 	//”ñƒAƒNƒeƒBƒuŽžƒ|ƒbƒvƒAƒbƒv•\Ž¦
@@ -1033,18 +1041,14 @@ begin
 	// ƒuƒ‰ƒEƒUÅ‘剻
 	GikoSys.Setting.BrowserAutoMaximize := TGikoBrowserAutoMaximize( BrowserMaxCombo.ItemIndex );
 	//ƒ|ƒbƒvƒAƒbƒvˆÊ’u
-	case PopupPositionRadioGroup.ItemIndex of
-		0: GikoSys.Setting.PopupPosition := gppRightTop;
-		1: GikoSys.Setting.PopupPosition := gppRight;
-		2: GikoSys.Setting.PopupPosition := gppRightBottom;
-		3: GikoSys.Setting.PopupPosition := gppTop;
-		4: GikoSys.Setting.PopupPosition := gppCenter;
-		5: GikoSys.Setting.PopupPosition := gppBottom;
-		6: GikoSys.Setting.PopupPosition := gppLeftTop;
-		7: GikoSys.Setting.PopupPosition := gppLeft;
-		8: GikoSys.Setting.PopupPosition := gppLeftBottom;
-	end;
-
+    if (gppRightTopRB.Checked) then GikoSys.Setting.PopupPosition := gppRightTop;
+    if (gppRightRB.Checked) then GikoSys.Setting.PopupPosition := gppRight;
+    if (gppRighBottomRB.Checked) then GikoSys.Setting.PopupPosition := gppRightBottom;
+    if (gppTopRB.Checked) then GikoSys.Setting.PopupPosition := gppTop;
+    if (gppBottomRB.Checked) then GikoSys.Setting.PopupPosition := gppBottom;
+    if (gppLeftTopRB.Checked) then GikoSys.Setting.PopupPosition := gppLeftTop;
+    if (gppLeftRB.Checked) then GikoSys.Setting.PopupPosition := gppLeft;
+    if (gppLeftBottomRB.Checked) then GikoSys.Setting.PopupPosition := gppLeftBottom;
 	//”ñƒAƒNƒeƒBƒuŽžƒ|ƒbƒvƒAƒbƒv•\Ž¦
 	GikoSys.Setting.UnActivePopup := UnActivePopupCheckBox.Checked;
 	//ƒŒƒXƒ|ƒbƒvƒAƒbƒvƒ{[ƒ‹ƒh•\Ž¦

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -112,7 +112,6 @@ begin
             FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
             SetWindowPos(FChild.Handle, HWND_BOTTOM,
                 0, 0, 0 , 0,
-//                SWP_NOZORDER or
                 SWP_NOSIZE or SWP_NOMOVE or  SWP_NOACTIVATE or SWP_HIDEWINDOW);
             Result := FChild;
         end;
@@ -125,7 +124,6 @@ begin
         Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
         SetWindowPos(Self.Handle, HWND_BOTTOM,
             0, 0, 0 , 0,
-//            SWP_NOZORDER or
             SWP_NOSIZE or SWP_NOMOVE or  SWP_NOACTIVATE or SWP_HIDEWINDOW);
         Result := Self;
     end;
@@ -262,7 +260,7 @@ function TResPopupBrowser.CalcRect(MaxHeight: Integer; MaxWidth: Integer; Scroll
 var
 	p: TPoint;
     ele: IHTMLElement2;
-    h, w: Integer;
+    h, w, dx1, dx2, dy1, dy2: Integer;
 begin
 	GetCursorpos(p);
     ele := ((Self.Document as IHTMLDocument2).body as IHTMLElement2);
@@ -273,39 +271,107 @@ begin
         h := GetWindowHeight + 5;
         w := ele.scrollWidth + 10;
     end;
+
+    dx1 := 0; dx2 := 0;
+    dy1 := 0; dy2 := 0;
+
 	Result := Rect(0, 0, w, h);
     case GikoSys.Setting.PopupPosition of
-        gppRightTop: 		OffsetRect(Result, p.x - w - 2, p.y - h - 2);
-        gppRight: 			OffsetRect(Result, p.x - w - 2, p.y - (h div 2));
-        gppRightBottom: OffsetRect(Result, p.x - w -2, p.y + 2);
-        gppTop:					OffsetRect(Result, p.x - (w div 2), p.y - h - 2);
-        gppCenter:			OffsetRect(Result, p.x - (w div 2), p.y - (h div 2));
-    	gppBottom:			OffsetRect(Result, p.x - (w div 2), p.y + 2);
-        gppLeftTop:			OffsetRect(Result, p.x + 2, p.y - h - 2);
-        gppLeft:				OffsetRect(Result, p.x + 2, p.y - (h div 2));
-        gppLeftBottom: 	OffsetRect(Result, p.x + 2, p.y + 2);
+        gppRightTop:
+        begin
+            dx1 := -w; dx2 := -2;
+            dy1 := -h; dy2 := -2;
+        end;
+        gppRight:
+        begin
+            dx1 := -w; dx2 := -2;
+            dy1 := - (h div 2); dy2 := 0;
+        end;
+        gppRightBottom:
+        begin
+            dx1 := -w; dx2 := -2;
+            dy1 := 0; dy2 := +2;
+        end;
+        gppTop:
+        begin
+            dx1 := - (w div 2); dx2 := 0;
+            dy1 := -h; dy2 := -2;
+        end;
+        // ”pŽ~ gppCenter: OffsetRect(Result, p.x - (w div 2), p.y - (h div 2));
+    	gppBottom:
+        begin
+            dx1 := - (w div 2); dx2 := 0;
+            dy1 := 0; dy2 := +2;
+        end;
+        gppLeftTop:
+        begin
+            dx1 := 0; dx2 := +2;
+            dy1 := -h; dy2 := -2;
+        end;
+        gppLeft:
+        begin
+            dx1 := 0; dx2 := +2;
+            dy1 := - (h div 2); dy2 := 0;
+        end;
+        gppLeftBottom:
+        begin
+            dx1 := 0; dx2 := +2;
+            dy1 := 0; dy2 := +2;
+        end;
     end;
+    // ‰ŠúˆÊ’u‚Ɉړ®
+    OffsetRect(Result, p.x + dx1 + dx2, p.y + dy1 + dy2);
+
+    // ˆÈ‰ºA‰ŠúˆÊ’u‚É–â‘肪‚ ‚é‚Æ‚«‚̈ړ®
     if (Result.Left < 0) then begin
-        OffsetRect(Result, -Result.Left, 0);
+        // ‹tƒTƒCƒh‚É—]—T‚ª‚ ‚ê‚΁Ao—͈ʒu‚̍¶‰E“]Š·
+        if (p.X * 2 < MaxWidth) then begin
+            if ( (GikoSys.Setting.PopupPosition = gppTop) or
+                (GikoSys.Setting.PopupPosition = gppBottom)) then begin
+                OffsetRect(Result, -Result.Left, 0);
+            end else begin
+                OffsetRect(Result, - (dx1 + 2 * dx2), 0);
+            end;
+        end else begin
+            // ‰æ–Ê’[‚܂ʼnæ–Ê•‚ð¬‚³‚­‚·‚é
+            Result := Rect(0, Result.Top,
+                Result.Right, Result.Bottom);
+        end;
     end;
     if (Result.Top < 0) then begin
-        OffsetRect(Result, 0, -Result.Top);
+        // ’ꑤ‚É—]—T‚ª‚ ‚ê‚΁Ao—͈ʒu‚̏㉺“]Š·
+        if (p.Y * 2 < MaxHeight) then begin
+            OffsetRect(Result, 0, - (dy1 + 2 * dy2));
+        end else begin
+            // ‰æ–Ê’[‚܂ʼnæ–ʍ‚‚ð¬‚³‚­‚·‚é
+            Result := Rect(Result.Left, 0,
+                Result.Right, Result.Bottom);
+        end;
     end;
     if (Result.Right > MaxWidth) then begin
-        OffsetRect(Result, - (Result.Right - MaxWidth), 0);
+        // ‹tƒTƒCƒh‚É—]—T‚ª‚ ‚ê‚΁Ao—͈ʒu‚̍¶‰E“]Š·
+        if (p.X * 2 > MaxWidth) then begin
+            if( (GikoSys.Setting.PopupPosition = gppTop) or
+                (GikoSys.Setting.PopupPosition = gppBottom)) then begin
+                OffsetRect(Result, -(Result.Right - MaxWidth), 0);
+            end else begin
+                OffsetRect(Result, -w - (dx1 + 2 * dx2), 0);
+            end;
+        end else begin
+            // ‰æ–Ê’[‚܂ʼnæ–Ê•‚ð¬‚³‚­‚·‚é
+            Result := Rect(Result.Left, Result.Top,
+                MaxWidth, Result.Bottom);
+        end;
     end;
     if (Result.Bottom > MaxHeight) then begin
-        OffsetRect(Result, 0, - (Result.Bottom - MaxHeight));
-    end;
-
-    // ‚±‚±‚ōēx¶‚Əã‚ðŠm”F‚µ‚Ä”ò‚яo‚µ‚Ä‚½‚çA‰æ–ʃTƒCƒY‚ð¬‚³‚­‚·‚é
-    if (Result.Left < 0) then begin
-        Result := Rect(0, Result.Top,
-            Result.Right, Result.Bottom);
-    end;
-    if (Result.Top < 0) then begin
-        Result := Rect(Result.Left, 0,
-            Result.Right, Result.Bottom);
+        // ã‘¤‚É—]—T‚ª‚ ‚ê‚΁Ao—͈ʒu‚̏㉺“]Š·
+        if (p.Y * 2 > MaxHeight) then begin
+            OffsetRect(Result, 0, -h - (dy1 + 2 * dy2));
+        end else begin
+            // ‰æ–Ê’[‚܂ʼnæ–ʍ‚‚ð¬‚³‚­‚·‚é
+            Result := Rect(Result.Left, Result.Top,
+                Result.Right, 0);
+        end;
     end;
 end;
 function TResPopupBrowser.GetWindowHeight : Integer;

--- a/Setting.pas
+++ b/Setting.pas
@@ -1148,7 +1148,10 @@ begin
 
 		//ƒ|ƒbƒvƒAƒbƒvˆÊ’u
 		FPopupPosition := TGikoPopupPosition(ini.ReadInteger('Browser', 'PopupPosition', Ord(gppLeftBottom)));
-
+        // ƒoƒ^56ˆÈ‘O‚©‚ç‚̃Aƒbƒvƒf[ƒg‘΍ô
+        if (FPopupPosition = gppCenter) then begin
+            FPopupPosition := gppTop;
+        end;
 		//ƒAƒhƒŒƒXƒo[
 		FURLDisplay := ini.ReadBool('AddressBar', 'URLDisplay', False);
 		FAddressBarTabStop := ini.ReadBool('AddressBar', 'TabStop', True);