Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 09:26:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed up default sizes for list icons and main page icons for high DPI screens

Browse Source
This commit is contained in:
csoler 2015-10-20 22:00:15 -04:00
parent 1d1904cae1
commit 6f3ba57314
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -20,6 +20,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <math.h>
#include <QDir> #include <QDir>
#include <QCoreApplication> #include <QCoreApplication>
#include <QStyleFactory> #include <QStyleFactory>
@ -237,26 +238,32 @@ void RshareSettings::setToolButtonStyle(Qt::ToolButtonStyle style)
} }
} }
int RshareSettings::computeBestIconSize(int n_sizes,int *sizes,int recommended_size)
{
float default_size = QFontMetricsF(QWidget().font()).height()/16.0 * recommended_size ;
float closest_ratio_dist = 10000.0f ;
int best_default_size = sizes[0] ;
for(int i=0;i<n_sizes;++i)
{
float ratio = default_size / sizes[i] ;
if(fabsf(ratio - 1.0f) < closest_ratio_dist)
{
closest_ratio_dist = fabsf(ratio-1.0f) ;
best_default_size = sizes[i] ;
}
}
return best_default_size ;
}
/** Gets the tool button's size.*/ /** Gets the tool button's size.*/
int RshareSettings::getToolButtonSize() int RshareSettings::getToolButtonSize()
{ {
int intValue=value(SETTING_TOOLBUTTONSIZE, 24).toInt(); static int sizes[6] = { 8,16,24,32,64,128 } ;
switch (intValue)
{ return value(SETTING_TOOLBUTTONSIZE, computeBestIconSize(6,sizes,24)).toInt();
case 8:
return 8;
case 16:
return 16;
case 24:
default:
return 24;
case 32:
return 32;
case 64:
return 64 ;
case 128:
return 128 ;
}
} }
/** Sets the tool button's size.*/ /** Sets the tool button's size.*/
@ -289,23 +296,9 @@ void RshareSettings::setToolButtonSize(int size)
/** Gets the list item icon's size.*/ /** Gets the list item icon's size.*/
int RshareSettings::getListItemIconSize() int RshareSettings::getListItemIconSize()
{ {
int intValue=value(SETTING_LISTITEMICONSIZE, 24).toInt(); static int sizes[6] = { 8,16,24,32,64,128 } ;
switch (intValue)
{ return value(SETTING_LISTITEMICONSIZE, computeBestIconSize(6,sizes,24)).toInt();
case 8:
return 8;
case 16:
return 16;
case 24:
default:
return 24;
case 32:
return 32;
case 64:
return 64;
case 128:
return 128;
}
} }
/** Sets the list item icon's size.*/ /** Sets the list item icon's size.*/

3
retroshare-gui/src/gui/settings/rsharesettings.h
View File

@ -316,6 +316,9 @@ public:
bool getWebinterfaceAllowAllIps(); bool getWebinterfaceAllowAllIps();
void setWebinterfaceAllowAllIps(bool allow_all); void setWebinterfaceAllowAllIps(bool allow_all);
// proxy function that computes the best icon size among sizes passed as array, to match the recommended size on screen.
int computeBestIconSize(int n_sizes, int *sizes, int recommended_size);
protected: protected:
/** Default constructor. */ /** Default constructor. */
RshareSettings(); RshareSettings();