diff --git a/clients/nitrogen/nitrogen.h b/clients/nitrogen/nitrogen.h index 09b05d16e0..00e1cedae7 100644 --- a/clients/nitrogen/nitrogen.h +++ b/clients/nitrogen/nitrogen.h @@ -67,7 +67,8 @@ namespace Nitrogen around window that is clickable although it is part of the shadow */ static const int EXTENDED_HITAREA = 0; - + static const int TFRAMESIZE = 3; + Q_DECLARE_FLAGS(ButtonTypes, ButtonType) //! window decoration factory diff --git a/clients/nitrogen/nitrogenclient.cpp b/clients/nitrogen/nitrogenclient.cpp index a56e745a2e..565f6616b2 100644 --- a/clients/nitrogen/nitrogenclient.cpp +++ b/clients/nitrogen/nitrogenclient.cpp @@ -148,12 +148,12 @@ namespace Nitrogen border = 1; } else { - if( lm == LM_BorderBottom && frameBorder == NitrogenConfiguration::BorderTiny ) + if( lm == LM_BorderBottom && frameBorder >= NitrogenConfiguration::BorderTiny ) { // for tiny border, the convention is to have a larger bottom area in order to // make resizing easier - border = 4; + border = qMax(frameBorder, 4); } else { @@ -170,7 +170,7 @@ namespace Nitrogen { int border = 0; if( !( respectWindowState && maximized )) - { border = qMax( 3, frameBorder-2 ); } + { border = TFRAMESIZE; } return border + extraBorder;