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

Initial commit for real hidpi support

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

59
rtgui/editwindow.cc
View File

@@ -57,15 +57,14 @@ EditWindow* EditWindow::getInstance(RTWindow* p)
}
EditWindow::EditWindow (RTWindow* p)
: resolution(RTScalable::baseDPI)
, parent(p)
: parent(p)
, isFullscreen(false)
, isClosed(true)
, isMinimized(false)
{
// Set window icon
set_default_icon_name("rawtherapee");
updateResolution();
setAppIcon();
set_title_decorated("");
set_modal(false);
set_resizable(true);
@@ -165,56 +164,8 @@ void EditWindow::on_realize ()
editWindowCursorManager.init (get_window());
}
bool EditWindow::updateResolution()
{
int scale = get_scale_factor();
double res = get_screen()->get_resolution();
if (scale == 2) {
// from Windows' behavior : if scale==2, resolution = 192. (Gtk shows 96 dpi !?), there's no higher value
res = RTScalable::baseHiDPI;
}
bool retVal = res != resolution;
resolution = res;
return retVal;
}
void EditWindow::setAppIcon()
{
Glib::ustring fName;
bool downsize = false;
// findIconAbsolutePath won't be able to select the image based on resolution with the
// storage of the images, we're doing the selection here
if (resolution == RTScalable::baseDPI) {
fName = "rawtherapee-logo-24.png";
} else {
fName = "rawtherapee-logo-48.png";
if (resolution < RTScalable::baseHiDPI) {
downsize = true;
}
}
Glib::ustring icon_path = Glib::build_filename (argv0, "images", fName);
const Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(icon_path);
if (!pixbuf) {
return;
}
if (downsize) {
int size = int((48. * resolution) / RTScalable::baseHiDPI);
pixbuf->scale_simple(size, size, Gdk::InterpType::INTERP_BILINEAR);
}
try {
set_default_icon(pixbuf);
} catch(Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
}
bool EditWindow::on_configure_event(GdkEventConfigure* event)
{
if (updateResolution()) {
setAppIcon();
}
if (!options.meowMaximized && !isFullscreen && !isMinimized) {
get_position(options.meowX, options.meowY);
get_size(options.meowWidth, options.meowHeight);
@@ -253,11 +204,11 @@ void EditWindow::addEditorPanel (EditorPanel* ep, const std::string &name)
// construct closeable tab for the image
Gtk::Box* hb = Gtk::manage (new Gtk::Box ());
hb->pack_start (*Gtk::manage (new RTImage ("aperture.png")));
hb->pack_start (*Gtk::manage (new RTImage ("aperture")));
hb->pack_start (*Gtk::manage (new Gtk::Label (Glib::path_get_basename (name))));
hb->set_tooltip_markup (name);
Gtk::Button* closeb = Gtk::manage (new Gtk::Button ());
closeb->set_image (*Gtk::manage(new RTImage ("cancel-small.png")));
closeb->set_image (*Gtk::manage(new RTImage ("cancel-small", Gtk::ICON_SIZE_BUTTON)));
closeb->set_relief (Gtk::RELIEF_NONE);
closeb->set_focus_on_click (false);