OSDN Git Service
(root)
/
gikonavigoeson
/
gikonavi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f1e4097
)
マルチモニタ向けの修正(未確認)
author
h677
<h677>
Sun, 14 Oct 2007 04:23:30 +0000
(
04:23
+0000)
committer
h677
<h677>
Sun, 14 Oct 2007 04:23:30 +0000
(
04:23
+0000)
ResPopupBrowser.pas
patch
|
blob
|
history
diff --git
a/ResPopupBrowser.pas
b/ResPopupBrowser.pas
index
f42e50d
..
6039ba3
100644
(file)
--- a/
ResPopupBrowser.pas
+++ b/
ResPopupBrowser.pas
@@
-189,8
+189,9
@@
begin
+ ADocument + '<a name="bottom"></a></body></html>');
doc.Close;
+ ADocument + '<a name="bottom"></a></body></html>');
doc.Close;
-
- ARect := CalcRect(Screen.WorkAreaRect, not OnlyTitle);
+ //
\83
}
\83
\8b
\83
`
\83
\82
\83
j
\83
^
\91
Î
\89
\9e
+ ARect := CalcRect(Screen.MonitorFromPoint(p).WorkareaRect,
+ not OnlyTitle);
FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
@@
-340,22
+341,22
@@
begin
//
\88
È
\89
º
\81
A
\8f
\89
\8a
ú
\88
Ê
\92
u
\82
É
\96
â
\91
è
\82
ª
\82
\82
é
\82
Æ
\82
«
\82
Ì
\88
Ú
\93
®
if (Result.Left < WorkArea.Left) then begin
//
\8b
t
\83
T
\83
C
\83
h
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8d
¶
\89
E
\93
]
\8a
·
//
\88
È
\89
º
\81
A
\8f
\89
\8a
ú
\88
Ê
\92
u
\82
É
\96
â
\91
è
\82
ª
\82
\82
é
\82
Æ
\82
«
\82
Ì
\88
Ú
\93
®
if (Result.Left < WorkArea.Left) then begin
//
\8b
t
\83
T
\83
C
\83
h
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8d
¶
\89
E
\93
]
\8a
·
- if (
p.X
* 2 < MaxWidth) then begin
+ if (
(p.X - WorkArea.Left)
* 2 < MaxWidth) then begin
if ( (GikoSys.Setting.PopupPosition = gppTop) or
(GikoSys.Setting.PopupPosition = gppBottom)) then begin
if ( (GikoSys.Setting.PopupPosition = gppTop) or
(GikoSys.Setting.PopupPosition = gppBottom)) then begin
- OffsetRect(Result, -Result.Left,
WorkArea.Left
);
+ OffsetRect(Result, -Result.Left,
0
);
end else begin
OffsetRect(Result, - (dx1 + 2 * dx2), 0);
end;
end else begin
//
\89
æ
\96
Ê
\92
[
\82
Ü
\82
Å
\89
æ
\96
Ê
\95
\9d
\82
ð
\8f
¬
\82
³
\82
\82
·
\82
é
end else begin
OffsetRect(Result, - (dx1 + 2 * dx2), 0);
end;
end else begin
//
\89
æ
\96
Ê
\92
[
\82
Ü
\82
Å
\89
æ
\96
Ê
\95
\9d
\82
ð
\8f
¬
\82
³
\82
\82
·
\82
é
- Result := Rect(
0
, Result.Top,
+ Result := Rect(
WorkArea.Left
, Result.Top,
Result.Right, Result.Bottom);
end;
end;
if (Result.Top < WorkArea.Top) then begin
//
\92
ê
\91
¤
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8f
ã
\89
º
\93
]
\8a
·
Result.Right, Result.Bottom);
end;
end;
if (Result.Top < WorkArea.Top) then begin
//
\92
ê
\91
¤
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8f
ã
\89
º
\93
]
\8a
·
- if (
p.Y
* 2 < MaxHeight) then begin
+ if (
(p.Y - WorkArea.Top)
* 2 < MaxHeight) then begin
OffsetRect(Result, 0, - (dy1 + 2 * dy2));
end else begin
//
\89
æ
\96
Ê
\92
[
\82
Ü
\82
Å
\89
æ
\96
Ê
\8d
\82
\82
ð
\8f
¬
\82
³
\82
\82
·
\82
é
OffsetRect(Result, 0, - (dy1 + 2 * dy2));
end else begin
//
\89
æ
\96
Ê
\92
[
\82
Ü
\82
Å
\89
æ
\96
Ê
\8d
\82
\82
ð
\8f
¬
\82
³
\82
\82
·
\82
é
@@
-365,7
+366,7
@@
begin
end;
if (Result.Right > WorkArea.Right) then begin
//
\8b
t
\83
T
\83
C
\83
h
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8d
¶
\89
E
\93
]
\8a
·
end;
if (Result.Right > WorkArea.Right) then begin
//
\8b
t
\83
T
\83
C
\83
h
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8d
¶
\89
E
\93
]
\8a
·
- if (
p.X
* 2 > WorkArea.Right) then begin
+ if (
(p.X - WorkArea.Left)
* 2 > WorkArea.Right) then begin
if( (GikoSys.Setting.PopupPosition = gppTop) or
(GikoSys.Setting.PopupPosition = gppBottom)) then begin
OffsetRect(Result, -(Result.Right - WorkArea.Right), 0);
if( (GikoSys.Setting.PopupPosition = gppTop) or
(GikoSys.Setting.PopupPosition = gppBottom)) then begin
OffsetRect(Result, -(Result.Right - WorkArea.Right), 0);
@@
-385,7
+386,7
@@
begin
end;
if (Result.Bottom > WorkArea.Bottom) then begin
//
\8f
ã
\91
¤
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8f
ã
\89
º
\93
]
\8a
·
end;
if (Result.Bottom > WorkArea.Bottom) then begin
//
\8f
ã
\91
¤
\82
É
\97
]
\97
T
\82
ª
\82
\82
ê
\82
Î
\81
A
\8f
o
\97
Í
\88
Ê
\92
u
\82
Ì
\8f
ã
\89
º
\93
]
\8a
·
- if (
p.Y
* 2 > WorkArea.Bottom) then begin
+ if (
(p.Y - WorkArea.Top)
* 2 > WorkArea.Bottom) then begin
OffsetRect(Result, 0, -h - (dy1 + 2 * dy2));
//
\8f
ã
\82
É
\8a
Ñ
\82
¢
\82
½
\8f
ê
\8d
\87
\82
Í
\81
A
if (Result.Top < WorkArea.Top) then begin
OffsetRect(Result, 0, -h - (dy1 + 2 * dy2));
//
\8f
ã
\82
É
\8a
Ñ
\82
¢
\82
½
\8f
ê
\8d
\87
\82
Í
\81
A
if (Result.Top < WorkArea.Top) then begin