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

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
parent 3d7ef4286e 15c18325c0
commit 434e121f99
264 changed files with 6738 additions and 5146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rtgui/filebrowserentry.h
View File

@@ -67,7 +67,7 @@ class FileBrowserEntry : public ThumbBrowserEntryBase,
bool onArea (CursorArea a, int x, int y);
void updateCursor (int x, int y);
void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c);
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c);
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c) override;
public:
@@ -78,8 +78,8 @@ public:
static Cairo::RefPtr<Cairo::ImageSurface> ps;
FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
~FileBrowserEntry ();
void draw (Cairo::RefPtr<Cairo::Context> cc);
~FileBrowserEntry () override;
void draw (Cairo::RefPtr<Cairo::Context> cc) override;
void setImageAreaToolListener (ImageAreaToolListener* l)
{
@@ -88,23 +88,23 @@ public:
FileThumbnailButtonSet* getThumbButtonSet ();
void refreshThumbnailImage ();
void refreshQuickThumbnailImage ();
void calcThumbnailSize ();
void refreshThumbnailImage () override;
void refreshQuickThumbnailImage () override;
void calcThumbnailSize () override;
virtual std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getIconsOnImageArea ();
virtual std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getSpecificityIconsOnImageArea ();
virtual void getIconSize (int& w, int& h);
std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getIconsOnImageArea () override;
std::vector<Cairo::RefPtr<Cairo::ImageSurface> > getSpecificityIconsOnImageArea () override;
void getIconSize (int& w, int& h) override;
// thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt);
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
// thumbimageupdatelistener interface
void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams);
void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams) override;
void _updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); // inside gtk thread
virtual bool motionNotify (int x, int y);
virtual bool pressNotify (int button, int type, int bstate, int x, int y);
virtual bool releaseNotify (int button, int type, int bstate, int x, int y);
bool motionNotify (int x, int y) override;
bool pressNotify (int button, int type, int bstate, int x, int y) override;
bool releaseNotify (int button, int type, int bstate, int x, int y) override;
};
#endif