mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-17 19:19:19 +02:00
Merge branch 'qt-getwheelscrolllines-fix' into 'main'
QT: Fixed uninitialized Result when getting WheelScrollLines See merge request freepascal.org/lazarus/lazarus!78
This commit is contained in:
commit
e7346c9f69
@ -7219,6 +7219,7 @@ var
|
|||||||
AScreen: Integer;
|
AScreen: Integer;
|
||||||
R: TRect;
|
R: TRect;
|
||||||
begin
|
begin
|
||||||
|
Result:=True;
|
||||||
case uiAction of
|
case uiAction of
|
||||||
SPI_GETWHEELSCROLLLINES: PDword(pvPAram)^ := QApplication_wheelScrollLines;
|
SPI_GETWHEELSCROLLLINES: PDword(pvPAram)^ := QApplication_wheelScrollLines;
|
||||||
SPI_GETWORKAREA:
|
SPI_GETWORKAREA:
|
||||||
@ -7227,7 +7228,6 @@ begin
|
|||||||
AScreen := QDesktopWidget_primaryScreen(ADesktop);
|
AScreen := QDesktopWidget_primaryScreen(ADesktop);
|
||||||
QDesktopWidget_availableGeometry(ADesktop, @R, AScreen);
|
QDesktopWidget_availableGeometry(ADesktop, @R, AScreen);
|
||||||
TRect(pvParam^) := R;
|
TRect(pvParam^) := R;
|
||||||
Result:=True;
|
|
||||||
end;
|
end;
|
||||||
else
|
else
|
||||||
Result := False;
|
Result := False;
|
||||||
|
@ -7170,6 +7170,7 @@ var
|
|||||||
AScreen: QScreenH;
|
AScreen: QScreenH;
|
||||||
R: TRect;
|
R: TRect;
|
||||||
begin
|
begin
|
||||||
|
Result:=True;
|
||||||
case uiAction of
|
case uiAction of
|
||||||
SPI_GETWHEELSCROLLLINES: PDword(pvPAram)^ := QApplication_wheelScrollLines;
|
SPI_GETWHEELSCROLLLINES: PDword(pvPAram)^ := QApplication_wheelScrollLines;
|
||||||
SPI_GETWORKAREA:
|
SPI_GETWORKAREA:
|
||||||
@ -7177,7 +7178,6 @@ begin
|
|||||||
AScreen := QGuiApplication_primaryScreen();
|
AScreen := QGuiApplication_primaryScreen();
|
||||||
QScreen_availableGeometry(AScreen, @R);
|
QScreen_availableGeometry(AScreen, @R);
|
||||||
TRect(pvParam^) := R;
|
TRect(pvParam^) := R;
|
||||||
Result:=True;
|
|
||||||
end;
|
end;
|
||||||
else
|
else
|
||||||
Result := False;
|
Result := False;
|
||||||
|
Loading…
Reference in New Issue
Block a user