mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-06 14:58:13 +02:00
gtk intf: fixed GetClientRect for notebook
git-svn-id: trunk@12694 -
This commit is contained in:
mattias
parent
ef2d81ca2c
commit
09342edb8f
@ -417,7 +417,7 @@ begin
|
||||
if p.y<1 then exit;
|
||||
CodeBuf:=SrcEdit.CodeToolsBuffer as TCodeBuffer;
|
||||
if CodeBuf=nil then exit;
|
||||
|
||||
// ToDo
|
||||
|
||||
while (p.y<=SrcEdit.LineCount) do begin
|
||||
Line:=SrcEdit.Lines[p.y-1];
|
||||
|
||||
@ -45,8 +45,14 @@ end;
|
||||
|
||||
function TScrollingWinControl.GetLogicalClientRect: TRect;
|
||||
begin
|
||||
Result:=Rect(0,0,Max(ClientWidth,FHorzScrollBar.Range),
|
||||
Max(ClientHeight,FVertScrollBar.Range));
|
||||
Result:=ClientRect;
|
||||
{if (FHorzScrollBar.Range>Result.Right)
|
||||
or (FVertScrollBar.Range>Result.Bottom) then
|
||||
DebugLn(['TScrollingWinControl.GetLogicalClientRect Client=',ClientWidth,'x',ClientHeight,' Ranges=',FHorzScrollBar.Range,'x',FVertScrollBar.Range]);}
|
||||
if (FHorzScrollBar.Range>Result.Right) then
|
||||
Result.Right:=FHorzScrollBar.Range;
|
||||
if (FVertScrollBar.Range>Result.Bottom) then
|
||||
Result.Bottom:=FVertScrollBar.Range;
|
||||
end;
|
||||
|
||||
procedure TScrollingWinControl.AlignControls(AControl: TControl;
|
||||
@ -219,7 +225,7 @@ end;
|
||||
|
||||
procedure TScrollingWinControl.WMHScroll(var Message : TLMHScroll);
|
||||
begin
|
||||
DebugLn(['TScrollingWinControl.WMHScroll ',dbgsName(Self)]);
|
||||
//DebugLn(['TScrollingWinControl.WMHScroll ',dbgsName(Self)]);
|
||||
HorzScrollbar.ScrollHandler(Message);
|
||||
end;
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
{off $DEFINE CHECK_POSITION}
|
||||
{$IFDEF CHECK_POSITION}
|
||||
const CheckPostionClassName = 'xxxTButtonPanel';
|
||||
const CheckPostionClassName = 'TPage';
|
||||
const CheckPostionName = 'xxxBakProjTypeRadioGroup';
|
||||
const CheckPostionParentName = 'xxxInheritedPage';
|
||||
|
||||
@ -3435,7 +3435,6 @@ function TWinControl.GetClientRect: TRect;
|
||||
var
|
||||
InterfaceWidth, InterfaceHeight: integer;
|
||||
begin
|
||||
//DebugLn(['TWinControl.GetClientRect ',DbgSName(Self),' ',DbgSName(Parent)]);
|
||||
if wcfClientRectNeedsUpdate in FWinControlFlags then begin
|
||||
if TWSWinControlClass(WidgetSetClass).GetDefaultClientRect(Self,
|
||||
Left, Top, Width, Height, Result)
|
||||
@ -6480,7 +6479,8 @@ begin
|
||||
' OldRelBounds=',dbgs(FBoundsRealized),
|
||||
' -> NewBounds=',dbgs(BoundsRect));
|
||||
{$ENDIF}
|
||||
DoSendBoundsToInterface;
|
||||
if (Width>0) and (Height>0) then
|
||||
DoSendBoundsToInterface;
|
||||
|
||||
if wcfColorChanged in FWinControlFlags then begin
|
||||
// replace by update style call
|
||||
|
||||
@ -8859,7 +8859,6 @@ begin
|
||||
RealizeGtkStyleColor(Style,Result);
|
||||
end;
|
||||
|
||||
{$IFDEF Gtk2}
|
||||
function GetStyleGroupboxFrameBorders: TRect;
|
||||
const s = 200;
|
||||
var
|
||||
@ -8877,8 +8876,12 @@ begin
|
||||
allocation.height:=s;
|
||||
gtk_widget_size_allocate(StyleObject^.Widget,@allocation);
|
||||
FrameWidget:=pGtkFrame(StyleObject^.Widget);
|
||||
{$IFDEF Gtk1}
|
||||
allocation:=FrameWidget^.bin.child^.allocation;
|
||||
{$ELSE}
|
||||
GTK_FRAME_GET_CLASS(FrameWidget)^.compute_child_allocation(
|
||||
FrameWidget,@allocation);
|
||||
{$ENDIF}
|
||||
//DebugLn(['GetStyleGroupboxFrame BBB2 ',dbgs(allocation)]);
|
||||
f.Left:=Min(s,Max(0,allocation.x));
|
||||
f.Top:=Min(s,Max(0,allocation.y));
|
||||
@ -8921,6 +8924,7 @@ begin
|
||||
Result:=StyleObject^.FrameBorders;
|
||||
end;
|
||||
|
||||
{$IFDEF Gtk2}
|
||||
function GetStyleFormFrameBorders(WithMenu: boolean): TRect;
|
||||
const s = 400;
|
||||
var
|
||||
@ -8942,13 +8946,13 @@ begin
|
||||
InnerWidget:=PGTKWidget(
|
||||
gtk_object_get_data(PGtkObject(StyleObject^.Widget),'fixedwidget'));
|
||||
allocation:=InnerWidget^.allocation;
|
||||
DebugLn(['GetStyleFormFrameBorders BBB2 ',dbgs(allocation),' WithMenu=',WithMenu,' ClientWidget=',GetWidgetDebugReport(InnerWidget)]);
|
||||
//DebugLn(['GetStyleFormFrameBorders BBB2 ',dbgs(allocation),' WithMenu=',WithMenu,' ClientWidget=',GetWidgetDebugReport(InnerWidget)]);
|
||||
f.Left:=Min(s,Max(0,allocation.x));
|
||||
f.Top:=Min(s,Max(0,allocation.y));
|
||||
f.Right:=Max(0,Min(s-f.Left,s-allocation.x-allocation.width));
|
||||
f.Bottom:=Max(0,Min(s-f.Top,s-allocation.x-allocation.width));
|
||||
StyleObject^.FrameBorders:=f;
|
||||
DebugLn(['GetStyleFormFrameBorders FrameBorders=',dbgs(StyleObject^.FrameBorders)]);
|
||||
//DebugLn(['GetStyleFormFrameBorders FrameBorders=',dbgs(StyleObject^.FrameBorders)]);
|
||||
StyleObject^.FrameBordersValid:=true;
|
||||
end;
|
||||
|
||||
@ -8965,7 +8969,7 @@ begin
|
||||
Result.Top:=Min(Outer.height,Max(0,Inner.y));
|
||||
Result.Right:=Max(0,Min(Outer.width-f.Left,Outer.width-Inner.x-Inner.width));
|
||||
Result.Bottom:=Max(0,Min(Outer.height-f.Top,Outer.height-Inner.x-Inner.width));
|
||||
DebugLn(['GetStyleFormFrameBorders BBB3 Inner=',dbgs(Inner),' Outer=',dbgs(Outer),' WithMenu=',WithMenu,' InnerWidget=',GetWidgetDebugReport(InnerWidget),' Result=',dbgs(Result)]);
|
||||
//DebugLn(['GetStyleFormFrameBorders BBB3 Inner=',dbgs(Inner),' Outer=',dbgs(Outer),' WithMenu=',WithMenu,' InnerWidget=',GetWidgetDebugReport(InnerWidget),' Result=',dbgs(Result)]);
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
|
||||
@ -778,9 +778,9 @@ function GetStyle(aStyle: TLazGtkStyle): PGTKStyle;
|
||||
function GetStyleWithName(const WName: String): PGTKStyle;
|
||||
function GetStyleWidget(aStyle: TLazGtkStyle): PGTKWidget;
|
||||
function GetStyleWidgetWithName(const WName: String): PGTKWidget;
|
||||
{$IFDEF Gtk2}
|
||||
function GetStyleGroupboxFrameBorders: TRect;
|
||||
function GetStyleNotebookFrameBorders: TRect;
|
||||
{$IFDEF Gtk2}
|
||||
function GetStyleFormFrameBorders(WithMenu: boolean): TRect;
|
||||
{$ENDIF}
|
||||
procedure StyleFillRectangle(drawable: PGDKDrawable; GC: PGDKGC;
|
||||
|
||||
@ -4645,7 +4645,6 @@ Function TGtkWidgetSet.GetClientRect(handle : HWND; var ARect : TRect) : Boolean
|
||||
var
|
||||
Widget, ClientWidget: PGtkWidget;
|
||||
|
||||
{$IFDEF Gtk2}
|
||||
procedure GetNoteBookClientRect(NBWidget: PGtkNotebook);
|
||||
var
|
||||
PageIndex: LongInt;
|
||||
@ -4678,7 +4677,6 @@ var
|
||||
//DebugLn(['GetNoteBookClientRect using defaults: ',GetWidgetDebugReport(Widget),' ARect=',dbgs(aRect)]);
|
||||
end;
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
begin
|
||||
Result := false;
|
||||
@ -4696,10 +4694,8 @@ begin
|
||||
ARect.Right:=0;
|
||||
ARect.Bottom:=0;
|
||||
end;
|
||||
{$IFDEF Gtk2}
|
||||
if GtkWidgetIsA(Widget,GTK_TYPE_NOTEBOOK) then
|
||||
if GtkWidgetIsA(Widget,gtk_notebook_get_type) then
|
||||
GetNoteBookClientRect(PGtkNoteBook(Widget));
|
||||
{$ENDIF}
|
||||
{$IfDef VerboseGetClientRect}
|
||||
if ClientWidget<>nil then begin
|
||||
DebugLn('GetClientRect Widget=',DbgS(handle),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user