vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed 'Always draw sizeGrip' option as it is both buggy and not really needed (no sense having non-zero border + size grip) 

svn path=/trunk/KDE/kdebase/workspace/; revision=1019943
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-09-04 20:46:37 +00:00
parent 624939fd60
commit 7b43894da0
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clients/nitrogen/CMakeLists.txt
View File

@ -1,3 +1,25 @@
# $Id: CMakeLists.txt,v 1.32 2009/08/25 15:28:13 hpereira Exp $
find_package (KDE4 REQUIRED)
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
set(CPACK_PACKAGE_NAME "kde4-windeco-nitrogen" )
set(CPACK_SOURCE_PACKAGE_NAME "kde4-windeco-nitrogen" )
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Kde4 Nitrogen window decoration")
set(CPACK_PACKAGE_VENDOR "hugo.pereira@free.fr")
set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "3")
set(CPACK_PACKAGE_VERSION_PATCH "7")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
include (CPack)
include (KDE4Defaults)
include (MacroLibrary)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories (${KDE4_INCLUDES} ${CMAKE_BINARY_DIR})
########### add version number into compilation defines
add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
add_subdirectory( config )
@ -28,5 +50,6 @@ target_link_libraries(
install(TARGETS kwin3_nitrogen DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install( FILES nitrogenclient.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

1
clients/nitrogen/config/nitrogenconfigurationui.cpp
View File

@ -194,7 +194,6 @@ namespace Nitrogen
sizeGripMode->insertItems(0, QStringList()
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripNever, true )
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripWhenNeeded, true )
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripAlways, true )
);
label->setAlignment( Qt::AlignRight|Qt::AlignVCenter );

1
clients/nitrogen/config/nitrogenexceptiondialog.cpp
View File

@ -127,7 +127,6 @@ namespace Nitrogen
sizeGripMode->insertItems(0, QStringList()
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripNever, true )
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripWhenNeeded, true )
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripAlways, true )
);
sizeGripMode->setEnabled( false );
checkboxes_.insert( std::make_pair( NitrogenException::SizeGripMode, checkbox ) );

4
clients/nitrogen/nitrogenconfiguration.cpp
View File

@ -247,7 +247,6 @@ namespace Nitrogen
const char* out;
switch( value )
{
case SizeGripAlways: out = "Always Show Extra Size Grip"; break;
case SizeGripNever: out = "Always Hide Extra Size Grip"; break;
case SizeGripWhenNeeded: out = "Show Extra Size Grip When Needed"; break;
default: return NitrogenConfiguration().sizeGripModeName( translated );
@ -260,8 +259,7 @@ namespace Nitrogen
//__________________________________________________
NitrogenConfiguration::SizeGripMode NitrogenConfiguration::sizeGripMode( QString value, bool translated )
{
if( value == sizeGripModeName( SizeGripAlways, translated ) ) return SizeGripAlways;
else if( value == sizeGripModeName( SizeGripNever, translated ) ) return SizeGripNever;
if( value == sizeGripModeName( SizeGripNever, translated ) ) return SizeGripNever;
else if( value == sizeGripModeName( SizeGripWhenNeeded, translated ) ) return SizeGripWhenNeeded;
else return NitrogenConfiguration().sizeGripMode();
}

7
clients/nitrogen/nitrogenconfiguration.h
View File

@ -82,7 +82,6 @@ namespace Nitrogen
//! size grip mode
enum SizeGripMode
{
SizeGripAlways,
SizeGripNever,
SizeGripWhenNeeded
};
@ -204,11 +203,7 @@ namespace Nitrogen
//! draw size grip
virtual bool drawSizeGrip( void ) const
{
return
sizeGripMode() == SizeGripAlways ||
(sizeGripMode() == SizeGripWhenNeeded && frameBorder() == BorderNone );
}
{ return (sizeGripMode() == SizeGripWhenNeeded && frameBorder() == BorderNone ); }
//@}