Initial commit for real hidpi support

Note: This commit has only been tested on MacOS

Changes:
- Icons now use the native hidpi support from Gtk (through Icon Theme)
- Icons are now directly generated from scalable file (i.e. SVG file)
- Widget sizes are scaled based on DPI and scale factor
- Font size is scaled based on DPI and scale factor
This commit is contained in:
Pandagrapher
2022-08-19 16:47:28 +02:00
parent 1e2dc30738
commit 89d2bdce5b
108 changed files with 1949 additions and 2032 deletions

View File

@@ -2,6 +2,7 @@
* This file is part of RawTherapee.
*
* Copyright (c) 2018 Jean-Christophe FRISCH <natureh.510@gmail.com>
* Copyright (c) 2022 Pierre CABRERA <pierre.cab@gmail.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,37 +19,70 @@
*/
#pragma once
#include <gtkmm/image.h>
#include "rtscalable.h"
/**
* @brief A derived class of Gtk::Image in order to handle theme-related icon sets.
* @brief A custom class in order to handle Hi-DPI surface.
*/
class RTSurface :
public RTScalable
class RTSurface final : public RTScalable
{
public:
RTSurface();
explicit RTSurface(const Glib::ustring& fileName, const Glib::ustring& rtlFileName = {});
void setImage(const Glib::ustring& fileName, const Glib::ustring& rtlFileName = {});
int getWidth() const;
int getHeight() const;
bool hasSurface() const;
Cairo::RefPtr<const Cairo::ImageSurface> get() const;
const Cairo::RefPtr<Cairo::ImageSurface>& get();
static void init();
static void updateImages();
static void setDPInScale(double newDPI, int newScale);
enum RTSurfaceType {
InvalidType = 1,
IconType = 2,
PNGType = 3,
SVGType = 4
};
private:
void changeImage(const Glib::ustring& imageName);
static double dpiBack; // used to keep track of master dpi change
static int scaleBack; // used to keep track of master scale change
double dpiBack; // Used to identify dpi change
int scaleBack; // Used to identify scale change
RTSurfaceType type;
Glib::ustring name;
Gtk::IconSize icon_size;
Cairo::RefPtr<Cairo::ImageSurface> surface;
public:
RTSurface();
explicit RTSurface(const Glib::ustring &icon_name, const Gtk::IconSize iconSize);
explicit RTSurface(const Glib::ustring &fname);
int getWidth();
int getHeight();
bool hasSurface();
Cairo::RefPtr<Cairo::ImageSurface> get();
};
/**
* @brief A custom class in order to handle Hi-DPI pixbuf.
*/
class RTPixbuf final : public RTScalable
{
public:
enum RTPixbufType {
InvalidType = 1,
IconType = 2,
PNGType = 3,
SVGType = 4
};
private:
double dpiBack; // Used to identify dpi change
int scaleBack; // Used to identify scale change
RTPixbufType type;
Glib::ustring name;
Gtk::IconSize icon_size;
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
public:
RTPixbuf();
explicit RTPixbuf(const Glib::ustring &icon_name, const Gtk::IconSize iconSize);
explicit RTPixbuf(const Glib::ustring &fname);
int getWidth();
int getHeight();
bool hasPixbuf();
Glib::RefPtr<Gdk::Pixbuf> get();
};