paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-11 17:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Repositioned scrollbars creation, fixed issues #9841 and #9864

Browse Source 
git-svn-id: trunk@12340 -
This commit is contained in:
zeljko 2007-10-06 09:21:39 +00:00
parent dae7d26d45
commit 096c6ceffd
2 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/interfaces/qt/qtwidgets.pas
View File

@ -2055,6 +2055,7 @@ begin
Msg.PaintStruct^.rcPaint := PaintData.ClipRect^;
Msg.PaintStruct^.hdc := FContext;
with getClientBounds do
SetWindowOrgEx(Msg.DC, -Left, -Top, nil);
@ -6577,7 +6578,7 @@ begin
if not (csDesigning in LCLObject.ComponentState) then
begin
i := getHeight;
QWidget_resize(Widget,getWidth,i + FHScrollBar.getHeight);
QWidget_resize(Widget,getWidth,i + GetSystemMetrics(SM_CYHSCROLL));
QWidget_update(Widget);
QWidget_resize(Widget,getWidth, i);
end;
@ -6601,12 +6602,12 @@ begin
begin
QAbstractScrollArea_setVerticalScrollBar(QAbstractScrollAreaH(Widget), QScrollBarH(FVScrollBar.Widget));
{$note WORKAROUND}
if not (csDesigning in LCLObject.ComponentState) and (horizontalScrollBar <> nil) then
if not (csDesigning in LCLObject.ComponentState) then
begin
i := getHeight;
QWidget_resize(Widget,getWidth,i + FVScrollBar.getWidth);
i := getWidth;
QWidget_resize(Widget,i + GetSystemMetrics(SM_CXVSCROLL), getHeight);
QWidget_update(Widget);
QWidget_resize(Widget,getWidth, i);
QWidget_resize(Widget,i, GetHeight);
end;
end;
end;

102
lcl/interfaces/qt/qtwinapi.inc
View File

@ -4306,7 +4306,7 @@ begin
(csDestroying in TQtWidget(Handle).LCLObject.ComponentState) then exit;
ScrollBar := TScrollBar(TQtWidget(Handle).LCLObject);
if not Assigned(ScrollBar) then exit;
if not Assigned(ScrollBar.Parent) then
@ -4325,32 +4325,14 @@ begin
then
exit;
{do not localize !}
ScrollBar := TScrollBar(TQtWidget(Handle).LCLObject.FindChildControl(TQtWidget(Handle).LCLObject.Name+'_HSCROLLBAR'));
if not Assigned(ScrollBar)
and not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomForm) then
if TQtWidget(Handle) is TQtAbstractScrollArea then
begin
ScrollBar := TScrollBar.Create(TQtWidget(Handle).LCLObject);
ScrollBar.Name := TQtWidget(Handle).LCLObject.Name+'_HSCROLLBAR'; {do not localize !}
ScrollBar.Parent := TQtWidget(Handle).LCLObject;
ScrollBar.Kind := sbHorizontal;
R := TQtWidget(Handle).LCLObject.ClientRect;
{if we have -width then av raises }
if (R.Right - ScrollBar.Height) >= 0 then
Scrollbar.Width := R.Right - ScrollBar.Height;
ScrollBar.Top := R.Bottom - ScrollBar.Height;
if (TQtWidget(Handle) is TQtAbstractScrollArea) then
begin
ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject;
TQtAbstractScrollArea(Handle).sethorizontalScrollBar(TQtScrollBar(ScrollBar.Handle));
{TODO: howto find ScrollBar style ?!?}
TQtAbstractScrollArea(Handle).setScrollStyle(ssAutoHorizontal);
TQtAbstractScrollArea(Handle).horizontalScrollBar.Show;
end;
end;
if TQtAbstractScrollArea(Handle).horizontalScrollBar <> nil then
ScrollBar := TScrollBar(TQtAbstractScrollArea(Handle).horizontalScrollBar.LCLObject);
end else
{do not localize !}
ScrollBar := TScrollBar(TQtWidget(Handle).LCLObject.FindChildControl(TQtWidget(Handle).LCLObject.Name+'_HSCROLLBAR'));
if Assigned(ScrollBar) then
ScrollBar.Visible := bRedraw;
@ -4363,34 +4345,14 @@ begin
then
exit;
{do not localize !}
ScrollBar := TScrollBar(TQtWidget(Handle).LCLObject.FindChildControl(TQtWidget(Handle).LCLObject.Name+'_VSCROLLBAR'));
if not Assigned(ScrollBar)
and not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomForm) then
if TQtWidget(Handle) is TQtAbstractScrollArea then
begin
ScrollBar := TScrollBar.Create(TQtWidget(Handle).LCLObject);
ScrollBar.Name := TQtWidget(Handle).LCLObject.Name+'_VSCROLLBAR'; {do not localize !}
ScrollBar.Parent := TQtWidget(Handle).LCLObject;
ScrollBar.Kind := sbVertical;
R := TQtWidget(Handle).LCLObject.ClientRect;
if TQtAbstractScrollArea(Handle).verticalScrollBar <> nil then
ScrollBar := TScrollBar(TQtAbstractScrollArea(Handle).verticalScrollBar.LCLObject);
end else
{do not localize !}
ScrollBar := TScrollBar(TQtWidget(Handle).LCLObject.FindChildControl(TQtWidget(Handle).LCLObject.Name+'_VSCROLLBAR'));
Scrollbar.Height := R.Bottom;
ScrollBar.Top := 0;
{TODO: Check why BorderWidth is 0 when BorderStyle is eg. bsSingle ?!? }
ScrollBar.Left := R.Right - ScrollBar.Width;
if (TQtWidget(Handle) is TQtAbstractScrollArea) then
begin
ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject;
TQtAbstractScrollArea(Handle).setVerticalScrollBar(TQtScrollBar(ScrollBar.Handle));
{TODO: howto find ScrollBar style ?!?}
TQtAbstractScrollArea(Handle).setScrollStyle(ssAutoVertical);
TQtAbstractScrollArea(Handle).verticalScrollBar.Show;
end;
end;
if Assigned(ScrollBar) then
ScrollBar.Visible := bRedraw;
@ -4433,6 +4395,34 @@ function TQtWidgetSet.ShowScrollBar(Handle: HWND; wBar: Integer; bShow: Boolean)
var
w: TQtWidget;
ScrollArea: TQtAbstractScrollArea;
ScrollBar: TScrollBar;
procedure PrepareHorizontalScrollBar;
begin
if ScrollArea.horizontalScrollBar = nil then
begin
ScrollBar := TScrollBar.Create(w.LCLObject);
ScrollBar.Parent := w.LCLObject;
ScrollBar.Kind := sbHorizontal;
ScrollArea.sethorizontalScrollBar(TQtScrollBar(ScrollBar.Handle));
ScrollArea.setScrollStyle(ssAutoHorizontal);
ScrollArea.horizontalScrollBar.Show;
end;
end;
procedure PrepareVerticalScrollBar;
begin
if ScrollArea.verticalScrollBar = nil then
begin
ScrollBar := TScrollBar.Create(w.LCLObject);
ScrollBar.Parent := w.LCLObject;
ScrollBar.Kind := sbVertical;
ScrollArea.setverticalScrollBar(TQtScrollBar(ScrollBar.Handle));
ScrollArea.setScrollStyle(ssAutoVertical);
ScrollArea.verticalScrollBar.Show;
end;
end;
begin
{$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI ShowScrollBar] Handle: ', dbghex(Handle),' wBar: ',wBar);
@ -4447,29 +4437,35 @@ begin
if w is TQtAbstractScrollArea then
begin
ScrollArea := TQtAbstractScrollArea(w);
case wBar of
SB_BOTH:
begin
PrepareHorizontalScrollBar;
PrepareVerticalScrollBar;
if bShow then
ScrollArea.setScrollStyle(ssBoth)
else
ScrollArea.setScrollStyle(ssNone);
end;
SB_HORZ:
begin
PrepareHorizontalScrollBar;
if bShow then
ScrollArea.setScrollStyle(ssHorizontal)
else
QAbstractScrollArea_setHorizontalScrollBarPolicy(QAbstractScrollAreaH(ScrollArea.Widget), QtScrollBarAlwaysOff);
end;
SB_VERT:
begin
PrepareVerticalScrollBar;
if bShow then
ScrollArea.setScrollStyle(ssVertical)
else
QAbstractScrollArea_setVerticalScrollBarPolicy(QAbstractScrollAreaH(ScrollArea.Widget), QtScrollBarAlwaysOff);
end;
SB_CTL:
begin
if bShow then