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

Qt,Qt5: implemented WP_SMALLCAPTION. issue #34459

Browse Source 
git-svn-id: trunk@59595 -
This commit is contained in:
zeljko 2018-11-18 16:56:43 +00:00
parent b2f4e56a09
commit 2668b33701
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/qt/qtthemes.pas
View File

@ -385,8 +385,12 @@ begin
QStyleCC_TitleBar, QStyleCC_MdiControls:
begin
opt := QStyleOptionTitleBar_create();
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowSystemMenuHint);
if Element.SubControls = QStyleSC_TitleBarLabel then
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowTitleHint)
else
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowSystemMenuHint);
// workaround: qt has own minds about position of requested part -
// but we need a way to draw it at our position
Context.translate(ARect.Left, ARect.Top);
@ -829,7 +833,8 @@ begin
end;
if (Details.Element = teWindow) then
begin
if Details.Part in [WP_FRAMELEFT,
if Details.Part in [WP_SMALLCAPTION,
WP_FRAMELEFT,
WP_FRAMERIGHT,
WP_FRAMEBOTTOM,
WP_SMALLFRAMELEFT,
@ -1119,6 +1124,7 @@ begin
exit;
end;
WP_SMALLCAPTION: Result.SubControls := QStyleSC_TitleBarLabel;
WP_SYSBUTTON: Result.SubControls := QStyleSC_TitleBarSysMenu;
WP_MINBUTTON: Result.SubControls := QStyleSC_TitleBarMinButton;
WP_MAXBUTTON: Result.SubControls := QStyleSC_TitleBarMaxButton;

13
lcl/interfaces/qt5/qtthemes.pas
View File

@ -383,8 +383,12 @@ begin
QStyleCC_TitleBar, QStyleCC_MdiControls:
begin
opt := QStyleOptionTitleBar_create();
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowSystemMenuHint);
if Element.SubControls = QStyleSC_TitleBarLabel then
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowTitleHint)
else
QStyleOptionTitleBar_setTitleBarFlags(QStyleOptionTitleBarH(opt),
QtWindow or QtWindowSystemMenuHint);
// workaround: qt has own minds about position of requested part -
// but we need a way to draw it at our position
Context.translate(ARect.Left, ARect.Top);
@ -827,7 +831,8 @@ begin
end;
if (Details.Element = teWindow) then
begin
if Details.Part in [WP_FRAMELEFT,
if Details.Part in [WP_SMALLCAPTION,
WP_FRAMELEFT,
WP_FRAMERIGHT,
WP_FRAMEBOTTOM,
WP_SMALLFRAMELEFT,
@ -1116,7 +1121,7 @@ begin
Result.StandardPixmap := QStyleSP_TitleBarCloseButton;
exit;
end;
WP_SMALLCAPTION: Result.SubControls := QStyleSC_TitleBarLabel;
WP_SYSBUTTON: Result.SubControls := QStyleSC_TitleBarSysMenu;
WP_MINBUTTON: Result.SubControls := QStyleSC_TitleBarMinButton;
WP_MAXBUTTON: Result.SubControls := QStyleSC_TitleBarMaxButton;