liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using scale factor for font and pixel size scaling

Browse Source
This commit is contained in:
Pandagrapher 2022-12-09 16:09:03 +01:00
parent cc48ad2aa1
commit 21ebb81ece
10 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/cropwindow.cc
View File

@ -67,8 +67,7 @@ CropWindow::CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDet
const int fontSize = 8; // pt const int fontSize = 8; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c
@ -2467,8 +2466,7 @@ void CropWindow::drawDecoration (Cairo::RefPtr<Cairo::Context> cr)
const int fontSize = 8; // pt const int fontSize = 8; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c
@ -2544,8 +2542,7 @@ void CropWindow::drawStraightenGuide (Cairo::RefPtr<Cairo::Context> cr)
const int fontSize = 8; // pt const int fontSize = 8; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

3
rtgui/filebrowserentry.cc
View File

@ -792,8 +792,7 @@ void FileBrowserEntry::drawStraightenGuide (Cairo::RefPtr<Cairo::Context> cr)
const int fontSize = 8; // pt const int fontSize = 8; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

3
rtgui/imagearea.cc
View File

@ -158,8 +158,7 @@ void ImageArea::setInfoText (Glib::ustring text)
const int fontSize = 10; // pt const int fontSize = 10; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

3
rtgui/lockablecolorpicker.cc
View File

@ -51,8 +51,7 @@ void LockableColorPicker::updateBackBuffer ()
const int fontSize = options.CPFontFamily == "default" ? 8 : options.CPFontSize; // pt const int fontSize = options.CPFontFamily == "default" ? 8 : options.CPFontSize; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

4
rtgui/preferences.cc
View File

@ -2494,9 +2494,9 @@ void Preferences::switchFontTo(const Glib::ustring &newFontFamily, const int new
try { try {
//GTK318 //GTK318
//#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20 //#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
// fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize * RTScalable::getScale())); // fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize));
//#else //#else
fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize * RTScalable::getScale())); fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize));
//#endif //#endif
//GTK318 //GTK318
} catch (Glib::Error &err) { } catch (Glib::Error &err) {

3
rtgui/rtscalable.cc
View File

@ -267,8 +267,7 @@ int RTScalable::getScale ()
double RTScalable::getGlobalScale() double RTScalable::getGlobalScale()
{ {
return (RTScalable::getDPI() / RTScalable::baseDPI * return (RTScalable::getDPI() / RTScalable::baseDPI);
static_cast<double>(RTScalable::getScale()));
} }
int RTScalable::scalePixelSize(const int pixel_size) int RTScalable::scalePixelSize(const int pixel_size)

5
rtgui/rtscalable.h
View File

@ -33,7 +33,7 @@
* - Absolute size (i.e. "px") * - Absolute size (i.e. "px")
* - Non-absolute size (i.e. "pt"): The default resolution is 72 DPI (i.e. pt per inch). To * - Non-absolute size (i.e. "pt"): The default resolution is 72 DPI (i.e. pt per inch). To
* convert the size to "px", use the following formula: * convert the size to "px", use the following formula:
* "size in px" = "size in pt" * ("device resolution" / 72) * "device scale" * "size in px" = "size in pt" * ("device resolution" / 72)
* *
* Hi-DPI implementation according to the OS (source: GDK code): * Hi-DPI implementation according to the OS (source: GDK code):
* - Windows: A default DPI of 96 is considered. Current DPI parameter is provided by the OS. * - Windows: A default DPI of 96 is considered. Current DPI parameter is provided by the OS.
@ -41,7 +41,8 @@
* forced to 96. * forced to 96.
* - MacOS: Scale is calculated from OS parameters (= "Retina screen width" / "Virtual width"). * - MacOS: Scale is calculated from OS parameters (= "Retina screen width" / "Virtual width").
* DPI is forced to 72. * DPI is forced to 72.
* - Linux: DPI is calculated from OS parameter (= 96 * "text-scaling-factor"). * - Linux: DPI is calculated from OS parameter (= 96 * "text-scaling-factor"). Note: "text-scaling-factor"
* is different from "device factor".
*/ */
class RTScalable class RTScalable
{ {

6
rtgui/rtwindow.cc
View File

@ -170,8 +170,7 @@ RTWindow::RTWindow ()
Glib::ustring css; Glib::ustring css;
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c
@ -206,8 +205,7 @@ RTWindow::RTWindow ()
#ifndef __APPLE__ #ifndef __APPLE__
// Guessing that pixel size is given for a 96 DPI reference: // Guessing that pixel size is given for a 96 DPI reference:
const double newFontScale = RTScalable::getDPI() / RTScalable::baseDPI const double newFontScale = RTScalable::getDPI() / RTScalable::baseDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

3
rtgui/shcselector.cc
View File

@ -199,8 +199,7 @@ void SHCSelector::updateBackBuffer()
const double fontSize = static_cast<double>(h) * 0.8; // pt const double fontSize = static_cast<double>(h) * 0.8; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c

3
rtgui/splash.cc
View File

@ -46,8 +46,7 @@ bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
const int fontSize = 12; // pt const int fontSize = 12; // pt
// Converting font size to "px" based on DPI and scale // Converting font size to "px" based on DPI and scale
#ifndef __APPLE__ #ifndef __APPLE__
const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI const double fontScale = RTScalable::getDPI() / RTScalable::pangoDPI; // Refer to notes in rtscalable.h
* static_cast<double>(RTScalable::getScale()); // Refer to notes in rtscalable.h
#else #else
// On MacOS, font is already scaled by the System library // On MacOS, font is already scaled by the System library
// Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c // Refer to https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gdk/quartz/gdkscreen-quartz.c