From f17068e8156f23882fe2ef8b7df4b33d6d0bf1a9 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Sat, 29 Aug 2009 05:38:58 +0000 Subject: [PATCH] added button-size dependent hard-coded icon scale (for drawing window icon in title bar) svn path=/trunk/KDE/kdebase/workspace/; revision=1016856 --- clients/nitrogen/nitrogenconfiguration.cpp | 14 ++++++++++++++ clients/nitrogen/nitrogenconfiguration.h | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/clients/nitrogen/nitrogenconfiguration.cpp b/clients/nitrogen/nitrogenconfiguration.cpp index cb86204236..117dc71474 100644 --- a/clients/nitrogen/nitrogenconfiguration.cpp +++ b/clients/nitrogen/nitrogenconfiguration.cpp @@ -193,6 +193,20 @@ namespace Nitrogen else return NitrogenConfiguration().buttonSize(); } + //__________________________________________________ + int NitrogenConfiguration::iconScale( ButtonSize value ) + { + switch( value ) + { + case ButtonSmall: return 13; + case ButtonDefault: return 16; + case ButtonLarge: return 24; + case ButtonHuge: return 35; + default: return NitrogenConfiguration().iconScale(); + } + + } + //__________________________________________________ QString NitrogenConfiguration::buttonTypeName( ButtonType value, bool translated ) { diff --git a/clients/nitrogen/nitrogenconfiguration.h b/clients/nitrogen/nitrogenconfiguration.h index eaa604e7b4..6e444edad4 100644 --- a/clients/nitrogen/nitrogenconfiguration.h +++ b/clients/nitrogen/nitrogenconfiguration.h @@ -135,10 +135,14 @@ namespace Nitrogen static QString buttonSizeName( ButtonSize, bool translated ); static ButtonSize buttonSize( QString, bool translated ); + static int iconScale( ButtonSize ); virtual ButtonSize buttonSize( void ) const { return buttonSize_; } + virtual int iconScale( void ) const + { return iconScale( buttonSize() ); } + virtual QString buttonSizeName( bool translated ) const { return buttonSizeName( buttonSize(), translated ); }