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

Merge remote-tracking branch 'origin/scrolled-toolbar-fix' into dev

Browse Source
This commit is contained in:
Hombre 2018-10-09 20:45:01 +02:00
commit da0830c794
9 changed files with 83 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rtgui/cropwindow.cc
View File

@ -267,15 +267,22 @@ void CropWindow::flawnOver (bool isFlawnOver)
this->isFlawnOver = isFlawnOver; this->isFlawnOver = isFlawnOver;
} }
void CropWindow::scroll (int state, GdkScrollDirection direction, int x, int y) void CropWindow::scroll (int state, GdkScrollDirection direction, int x, int y, double deltaX, double deltaY)
{ {
double delta = 0.0;
if (abs(deltaX) > abs(deltaY)) {
delta = deltaX;
} else {
delta = deltaY;
}
bool isUp = direction == GDK_SCROLL_UP || (direction == GDK_SCROLL_SMOOTH && delta < 0.0);
if ((state & GDK_CONTROL_MASK) && onArea(ColorPicker, x, y)) { if ((state & GDK_CONTROL_MASK) && onArea(ColorPicker, x, y)) {
// resizing a color picker // resizing a color picker
if (direction == GDK_SCROLL_UP) { if (isUp) {
hoveredPicker->incSize(); hoveredPicker->incSize();
updateHoveredPicker(); updateHoveredPicker();
iarea->redraw (); iarea->redraw ();
}else if (direction == GDK_SCROLL_DOWN) { } else {
hoveredPicker->decSize(); hoveredPicker->decSize();
updateHoveredPicker(); updateHoveredPicker();
iarea->redraw (); iarea->redraw ();
@ -287,9 +294,9 @@ void CropWindow::scroll (int state, GdkScrollDirection direction, int x, int y)
screenCoordToImage(newCenterX, newCenterY, newCenterX, newCenterY); screenCoordToImage(newCenterX, newCenterY, newCenterX, newCenterY);
if (direction == GDK_SCROLL_UP && !isMaxZoom()) { if (isUp && !isMaxZoom()) {
zoomIn (true, newCenterX, newCenterY); zoomIn (true, newCenterX, newCenterY);
} else if (direction == GDK_SCROLL_DOWN && !isMinZoom()) { } else if (!isUp && !isMinZoom()) {
zoomOut (true, newCenterX, newCenterY); zoomOut (true, newCenterX, newCenterY);
} }
} }

2
rtgui/cropwindow.h
View File

@ -187,7 +187,7 @@ public:
bool isInside (int x, int y); bool isInside (int x, int y);
void scroll (int state, GdkScrollDirection direction, int x, int y); void scroll (int state, GdkScrollDirection direction, int x, int y, double deltaX=0.0, double deltaY=0.0);
void buttonPress (int button, int num, int state, int x, int y); void buttonPress (int button, int num, int state, int x, int y);
void buttonRelease (int button, int num, int state, int x, int y); void buttonRelease (int button, int num, int state, int x, int y);
void pointerMoved (int bstate, int x, int y); void pointerMoved (int bstate, int x, int y);

20
rtgui/guiutils.cc
View File

@ -945,6 +945,9 @@ bool MyScrolledWindow::on_scroll_event (GdkEventScroll* event)
double step = adjust->get_step_increment(); double step = adjust->get_step_increment();
double value2 = 0.; double value2 = 0.;
printf("MyScrolledwindow::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
if (event->direction == GDK_SCROLL_DOWN) { if (event->direction == GDK_SCROLL_DOWN) {
value2 = value + step; value2 = value + step;
@ -962,6 +965,13 @@ bool MyScrolledWindow::on_scroll_event (GdkEventScroll* event)
value2 = lower; value2 = lower;
} }
if (value2 != value) {
scroll->set_value(value2);
}
} else if (event->direction == GDK_SCROLL_SMOOTH) {
if (abs(event->delta_y) > 0.1) {
value2 = rtengine::LIM<double>(value + (event->delta_y > 0 ? step : -step), lower, upper);
}
if (value2 != value) { if (value2 != value) {
scroll->set_value(value2); scroll->set_value(value2);
} }
@ -1010,6 +1020,9 @@ bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event)
double step = adjust->get_step_increment() * 2; double step = adjust->get_step_increment() * 2;
double value2 = 0.; double value2 = 0.;
printf("MyScrolledToolbar::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
if (event->direction == GDK_SCROLL_DOWN) { if (event->direction == GDK_SCROLL_DOWN) {
value2 = rtengine::min<double>(value + step, upper); value2 = rtengine::min<double>(value + step, upper);
if (value2 != value) { if (value2 != value) {
@ -1057,11 +1070,14 @@ MyComboBoxText::MyComboBoxText (bool has_entry) : Gtk::ComboBoxText(has_entry)
minimumWidth = naturalWidth = 70; minimumWidth = naturalWidth = 70;
Gtk::CellRendererText* cellRenderer = dynamic_cast<Gtk::CellRendererText*>(get_first_cell()); Gtk::CellRendererText* cellRenderer = dynamic_cast<Gtk::CellRendererText*>(get_first_cell());
cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE; cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE;
add_events(Gdk::SCROLL_MASK|Gdk::SMOOTH_SCROLL_MASK);
} }
bool MyComboBoxText::on_scroll_event (GdkEventScroll* event) bool MyComboBoxText::on_scroll_event (GdkEventScroll* event)
{ {
printf("MyComboboxText::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
// If Shift is pressed, the widget is modified // If Shift is pressed, the widget is modified
if (event->state & GDK_SHIFT_MASK) { if (event->state & GDK_SHIFT_MASK) {
Gtk::ComboBoxText::on_scroll_event(event); Gtk::ComboBoxText::on_scroll_event(event);
@ -1219,6 +1235,8 @@ bool MySpinButton::on_scroll_event (GdkEventScroll* event)
bool MyHScale::on_scroll_event (GdkEventScroll* event) bool MyHScale::on_scroll_event (GdkEventScroll* event)
{ {
printf("MyHScale::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
// If Shift is pressed, the widget is modified // If Shift is pressed, the widget is modified
if (event->state & GDK_SHIFT_MASK) { if (event->state & GDK_SHIFT_MASK) {
Gtk::HScale::on_scroll_event(event); Gtk::HScale::on_scroll_event(event);
@ -1343,7 +1361,7 @@ void MyFileChooserButton::set_filter(const Glib::RefPtr<Gtk::FileFilter> &filter
{ {
cur_filter_ = filter; cur_filter_ = filter;
} }
std::vector<Glib::RefPtr<Gtk::FileFilter>> MyFileChooserButton::list_filters() std::vector<Glib::RefPtr<Gtk::FileFilter>> MyFileChooserButton::list_filters()
{ {

7
rtgui/imagearea.cc
View File

@ -77,7 +77,7 @@ void ImageArea::on_realize()
// This workaround should be removed when bug is fixed in GTK2 or when migrating to GTK3 // This workaround should be removed when bug is fixed in GTK2 or when migrating to GTK3
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK); add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK);
#else #else
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK); add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
#endif #endif
Cairo::FontOptions cfo; Cairo::FontOptions cfo;
@ -302,9 +302,12 @@ bool ImageArea::on_button_press_event (GdkEventButton* event)
bool ImageArea::on_scroll_event (GdkEventScroll* event) bool ImageArea::on_scroll_event (GdkEventScroll* event)
{ {
printf("ImageArea::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
CropWindow* cw = getCropWindow (event->x, event->y); CropWindow* cw = getCropWindow (event->x, event->y);
if (cw) { if (cw) {
cw->scroll (event->state, event->direction, event->x, event->y); cw->scroll (event->state, event->direction, event->x, event->y, event->delta_x, event->delta_y);
} }
return true; return true;

7
rtgui/options.cc
View File

@ -1330,17 +1330,10 @@ void Options::readFromFile(Glib::ustring fname)
FileBrowserToolbarSingleRow = keyFile.get_boolean("GUI", "FileBrowserToolbarSingleRow"); FileBrowserToolbarSingleRow = keyFile.get_boolean("GUI", "FileBrowserToolbarSingleRow");
} }
#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3)
// Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413
hideTPVScrollbar = false;
#else
if (keyFile.has_key("GUI", "HideTPVScrollbar")) { if (keyFile.has_key("GUI", "HideTPVScrollbar")) {
hideTPVScrollbar = keyFile.get_boolean("GUI", "HideTPVScrollbar"); hideTPVScrollbar = keyFile.get_boolean("GUI", "HideTPVScrollbar");
} }
#endif
if (keyFile.has_key("GUI", "HistogramWorking")) { if (keyFile.has_key("GUI", "HistogramWorking")) {
rtSettings.HistogramWorking = keyFile.get_boolean("GUI", "HistogramWorking"); rtSettings.HistogramWorking = keyFile.get_boolean("GUI", "HistogramWorking");
} }

5
rtgui/preferences.cc
View File

@ -929,11 +929,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
ckbHideTPVScrollbar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_VSCROLLBAR")) ); ckbHideTPVScrollbar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_VSCROLLBAR")) );
setExpandAlignProperties (ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); setExpandAlignProperties (ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3)
// Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413
ckbHideTPVScrollbar->set_active(false);
ckbHideTPVScrollbar->set_sensitive(false);
#endif
workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1); workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);
workflowGrid->attach_next_to (*ckbHideTPVScrollbar, *hb4label, Gtk::POS_RIGHT, 1, 1); workflowGrid->attach_next_to (*ckbHideTPVScrollbar, *hb4label, Gtk::POS_RIGHT, 1, 1);
ckbAutoSaveTpOpen = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_AUTOSAVE_TP_OPEN"))); ckbAutoSaveTpOpen = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_AUTOSAVE_TP_OPEN")));

2
rtgui/previewwindow.cc
View File

@ -34,7 +34,7 @@ void PreviewWindow::on_realize ()
{ {
Gtk::DrawingArea::on_realize (); Gtk::DrawingArea::on_realize ();
add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK); add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
} }
void PreviewWindow::getObservedFrameArea (int& x, int& y, int& w, int& h) void PreviewWindow::getObservedFrameArea (int& x, int& y, int& w, int& h)

52
rtgui/thumbbrowserbase.cc
View File

@ -68,26 +68,59 @@ void ThumbBrowserBase::scrollChanged ()
} }
} }
void ThumbBrowserBase::scroll (int direction) void ThumbBrowserBase::scroll (int direction, double deltaX, double deltaY)
{ {
double delta = 0.0;
if (abs(deltaX) > abs(deltaY)) {
delta = deltaX;
} else {
delta = deltaY;
}
double coef = direction == GDK_SCROLL_DOWN || (direction == GDK_SCROLL_SMOOTH && delta > 0.0) ? +1.0 : -1.0;
// GUI already acquired when here // GUI already acquired when here
if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_DOWN) { if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_DOWN || direction == GDK_SCROLL_SMOOTH) {
if (arrangement == TB_Vertical) { if (arrangement == TB_Vertical) {
vscroll.set_value (vscroll.get_value() + (direction == GDK_SCROLL_DOWN ? +1 : -1) * vscroll.get_adjustment()->get_step_increment()); double currValue = vscroll.get_value();
double newValue = rtengine::LIM<double>(currValue + coef * vscroll.get_adjustment()->get_step_increment(),
vscroll.get_adjustment()->get_lower (),
vscroll.get_adjustment()->get_upper());
if (newValue != currValue) {
vscroll.set_value (newValue);
}
} else { } else {
hscroll.set_value (hscroll.get_value() + (direction == GDK_SCROLL_DOWN ? +1 : -1) * hscroll.get_adjustment()->get_step_increment()); double currValue = hscroll.get_value();
double newValue = rtengine::LIM<double>(currValue + coef * hscroll.get_adjustment()->get_step_increment(),
hscroll.get_adjustment()->get_lower(),
hscroll.get_adjustment()->get_upper());
if (newValue != currValue) {
hscroll.set_value (newValue);
}
} }
} }
} }
void ThumbBrowserBase::scrollPage (int direction) void ThumbBrowserBase::scrollPage (int direction)
{ {
// GUI already acquired when here
// GUI already acquired when here // GUI already acquired when here
if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_DOWN) { if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_DOWN) {
if (arrangement == TB_Vertical) { if (arrangement == TB_Vertical) {
vscroll.set_value (vscroll.get_value() + (direction == GDK_SCROLL_DOWN ? +1 : -1) * vscroll.get_adjustment()->get_page_increment()); double currValue = vscroll.get_value();
double newValue = rtengine::LIM<double>(currValue + (direction == GDK_SCROLL_DOWN ? +1 : -1) * vscroll.get_adjustment()->get_page_increment(),
vscroll.get_adjustment()->get_lower(),
vscroll.get_adjustment()->get_upper());
if (newValue != currValue) {
vscroll.set_value (newValue);
}
} else { } else {
hscroll.set_value (hscroll.get_value() + (direction == GDK_SCROLL_DOWN ? +1 : -1) * hscroll.get_adjustment()->get_page_increment()); double currValue = hscroll.get_value();
double newValue = rtengine::LIM<double>(currValue + (direction == GDK_SCROLL_DOWN ? +1 : -1) * hscroll.get_adjustment()->get_page_increment(),
hscroll.get_adjustment()->get_lower(),
hscroll.get_adjustment()->get_upper());
if (newValue != currValue) {
hscroll.set_value (newValue);
}
} }
} }
} }
@ -682,7 +715,7 @@ void ThumbBrowserBase::Internal::on_realize()
bgs = style->get_background_color(Gtk::STATE_FLAG_SELECTED); bgs = style->get_background_color(Gtk::STATE_FLAG_SELECTED);
set_can_focus(true); set_can_focus(true);
add_events(Gdk::EXPOSURE_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK); add_events(Gdk::EXPOSURE_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK | Gdk::KEY_PRESS_MASK);
set_has_tooltip (true); set_has_tooltip (true);
signal_query_tooltip().connect( sigc::mem_fun(*this, &ThumbBrowserBase::Internal::on_query_tooltip) ); signal_query_tooltip().connect( sigc::mem_fun(*this, &ThumbBrowserBase::Internal::on_query_tooltip) );
} }
@ -920,7 +953,10 @@ bool ThumbBrowserBase::Internal::on_scroll_event (GdkEventScroll* event)
{ {
// Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave) // Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave)
parent->scroll (event->direction); printf("ThumbBrowserBase::Internal::on_scroll_event / delta_x=%.5f, delta_y=%.5f, direction=%d, type=%d, send_event=%d\n",
event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
parent->scroll (event->direction, event->delta_x, event->delta_y);
return true; return true;
} }

2
rtgui/thumbbrowserbase.h
View File

@ -138,7 +138,7 @@ public:
enum Arrangement {TB_Horizontal, TB_Vertical}; enum Arrangement {TB_Horizontal, TB_Vertical};
void configScrollBars (); void configScrollBars ();
void scrollChanged (); void scrollChanged ();
void scroll (int direction); void scroll (int direction, double deltaX=0.0, double deltaY=0.0);
void scrollPage (int direction); void scrollPage (int direction);
private: private: