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

Merge with "Beep6581/dev" 2

Browse Source
This commit is contained in:
Pandagrapher
2023-03-11 11:03:19 +01:00
parent c28d5aab97
commit 2338b8f366
5 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
rtgui/rtimage.cc
View File

@@ -58,7 +58,8 @@ RTImage::RTImage () {}
RTImage::RTImage (const Glib::ustring& iconName, const Gtk::IconSize iconSize) :
Gtk::Image(),
size(iconSize),
icon_name(iconName)
icon_name(iconName),
g_icon(Glib::RefPtr<const Gio::Icon>())
{
// Set surface from icon cache
surface = RTImageCache::getCachedSurface(this->icon_name, this->size);
@@ -69,6 +70,16 @@ RTImage::RTImage (const Glib::ustring& iconName, const Gtk::IconSize iconSize) :
}
}
RTImage::RTImage (const Glib::RefPtr<const Gio::Icon>& gIcon, const Gtk::IconSize iconSize) :
Gtk::Image(),
size(iconSize),
icon_name(""),
g_icon(Glib::RefPtr<const Gio::Icon>())
{
// Configure RTImage based on g_icon
set(this->g_icon, this->size);
}
void RTImage::set_from_icon_name(const Glib::ustring& iconName)
{
this->icon_name = iconName;
@@ -80,6 +91,11 @@ void RTImage::set_from_icon_name(const Glib::ustring& iconName)
if (surface) {
set(surface->get());
}
// Unset Gio::Icon if firstly exists
if (this->g_icon) {
g_icon = Glib::RefPtr<const Gio::Icon>();
}
}
void RTImage::set_from_icon_name(const Glib::ustring& iconName, const Gtk::IconSize iconSize)
@@ -90,16 +106,54 @@ void RTImage::set_from_icon_name(const Glib::ustring& iconName, const Gtk::IconS
// Set surface from icon cache
surface = RTImageCache::getCachedSurface(this->icon_name, this->size);
// Add it to the RTImage if surface exists
// Add it to the RTImage if previously chosen
if (surface) {
set(surface->get());
}
// Unset Gio::Icon if previously chosen
if (this->g_icon) {
g_icon = Glib::RefPtr<const Gio::Icon>();
}
}
void RTImage::set_from_gicon(const Glib::RefPtr<const Gio::Icon>& gIcon)
{
this->g_icon = gIcon;
// Set image from Gio::Icon
set(this->g_icon, this->size);
// Unset surface if previously chosen
this->icon_name = "";
if (surface) {
surface = std::shared_ptr<RTSurface>();
}
}
void RTImage::set_from_gicon(const Glib::RefPtr<const Gio::Icon>& gIcon, const Gtk::IconSize iconSize)
{
this->g_icon = gIcon;
this->size = iconSize;
// Set image from Gio::Icon
set(this->g_icon, this->size);
// Unset surface if previously chosen
this->icon_name = "";
if (surface) {
surface = std::shared_ptr<RTSurface>();
}
}
int RTImage::get_width()
{
if (surface) {
return surface->getWidth();
} else if (g_icon) {
Gtk::Image::get_width();
}
return -1;
@@ -109,6 +163,8 @@ int RTImage::get_height()
{
if (surface) {
return surface->getHeight();
} else if (g_icon) {
Gtk::Image::get_height();
}
return -1;