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

Support more scroll devices for inspector window

Browse Source 
- introduce step increment for non-mac
- don't close pinned window on button press anymore
This commit is contained in:
rfranke 2020-01-05 17:48:24 +01:00
parent 6604ab1b7c
commit a064a225e0
2 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
rtgui/inspector.cc
View File

@ -86,16 +86,14 @@ Inspector::Inspector () : currImage(nullptr), scaled(false), active(false), pinn
{
set_name("Inspector");
window.set_visible(false);
window.set_title("RawTherapee Inspector");
window.add_events(Gdk::KEY_PRESS_MASK);
window.add_events(Gdk::BUTTON_PRESS_MASK);
window.add_events(Gdk::SCROLL_MASK);
window.signal_key_release_event().connect(sigc::mem_fun(*this, &Inspector::on_key_release));
window.signal_button_press_event().connect(sigc::mem_fun(*this, &Inspector::on_button_press));
window.signal_key_press_event().connect(sigc::mem_fun(*this, &Inspector::on_key_press));
window.signal_scroll_event().connect(sigc::mem_fun(*this, &Inspector::on_scroll));
window.set_title("RawTherapee Inspector");
add_events(Gdk::BUTTON_PRESS_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
window.add(*this);
window.show_all();
window.set_visible(false);
@ -128,20 +126,6 @@ bool Inspector::on_key_release(GdkEventKey *event)
return false;
}
bool Inspector::on_button_press(GdkEventButton *event)
{
if (event->type == GDK_BUTTON_PRESS) {
if (!pinned)
// pin window with mouse click
pinned = true;
else
// release window with another mouse click
window.set_visible(false);
return true;
}
return false;
}
bool Inspector::on_key_press(GdkEventKey *event)
{
switch (event->keyval) {
@ -162,7 +146,18 @@ bool Inspector::on_key_press(GdkEventKey *event)
return false;
}
bool Inspector::on_scroll(GdkEventScroll *event)
bool Inspector::on_button_press_event(GdkEventButton *event)
{
if (event->type == GDK_BUTTON_PRESS) {
if (!pinned)
// pin window with mouse click
pinned = true;
return true;
}
return false;
}
bool Inspector::on_scroll_event(GdkEventScroll *event)
{
if (!currImage)
return false;
@ -173,10 +168,46 @@ bool Inspector::on_scroll(GdkEventScroll *event)
int imH = currImage->imgBuffer.getHeight();
margin.x = (window.get_width() * deviceScale) / 2;
margin.y = (window.get_height() * deviceScale) / 2;
int new_x = rtengine::min<int>(center.x + event->delta_x * deviceScale, imW - margin.x);
int new_y = rtengine::min<int>(center.y + event->delta_y * deviceScale, imH - margin.y);
center.set(rtengine::max<int>(margin.x, new_x), rtengine::max<int>(margin.y, new_y));
#ifdef GDK_WINDOWING_QUARTZ
// event reports speed of scroll wheel
double step_x = -event->delta_x;
double step_y = event->delta_y;
#else
// assume fixed step of 5%
double step_x = 5;
double step_y = 5;
#endif
int delta_x = 0;
int delta_y = 0;
switch (event->direction) {
case GDK_SCROLL_SMOOTH:
#ifdef GDK_WINDOWING_QUARTZ
// no additional step for smooth scrolling
delta_x = event->delta_x * deviceScale;
delta_y = event->delta_y * deviceScale;
#else
// apply step to smooth scrolling as well
delta_x = event->delta_x * deviceScale * step_x * imW / 100;
delta_y = event->delta_y * deviceScale * step_y * imH / 100;
#endif
break;
case GDK_SCROLL_DOWN:
delta_y = step_y * deviceScale * imH / 100;
break;
case GDK_SCROLL_UP:
delta_y = -step_y * deviceScale * imH / 100;
break;
case GDK_SCROLL_LEFT:
delta_x = step_x * deviceScale * imW / 100;
break;
case GDK_SCROLL_RIGHT:
delta_x = -step_x * deviceScale * imW / 100;
break;
}
center.set(rtengine::LIM<int>(center.x + delta_x, margin.x, imW - margin.x),
rtengine::LIM<int>(center.y + delta_y, margin.y, imH - margin.y));
queue_draw();
return true;

5
rtgui/inspector.h
View File

@ -56,9 +56,10 @@ private:
Gtk::Window window;
bool on_key_release(GdkEventKey *event);
bool on_button_press(GdkEventButton *event);
bool on_key_press(GdkEventKey *event);
bool on_scroll(GdkEventScroll *event);
bool on_button_press_event(GdkEventButton *event) override;
bool on_scroll_event(GdkEventScroll *event) override;
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
void deleteBuffers();