*/
#include <iostream>
-#include <gtkmm2ext/scroomer.h>
+
+#include "gtkmm2ext/scroomer.h"
+#include "gtkmm2ext/keyboard.h"
using namespace Gtkmm2ext;
using namespace Gtk;
Scroomer::Scroomer(Gtk::Adjustment& adjustment)
: adj(adjustment)
, handle_size(0)
- , grab_comp(None) {
-
+ , grab_comp(None)
+{
position[TopBase] = 0;
position[Handle1] = 0;
position[Slider] = 0;
grab_y = ev->y;
- if (ev->state & GDK_CONTROL_MASK) {
- if (ev->state & GDK_MOD1_MASK) {
+ if (ev->state & Keyboard::PrimaryModifier) {
+ if (ev->state & Keyboard::SecondaryModifier) {
scale = 0.05;
} else {
scale = 0.1;
fract = max (-1.0, fract);
fract = -fract;
- switch(grab_comp) {
+ switch (grab_comp) {
case TopBase:
case BottomBase:
unzoomed_val += scale * fract * range;
return true;
}
- switch(grab_comp) {
+ switch (grab_comp) {
case TopBase:
break;
case Handle1:
{
int index = (int) c;
- switch(c) {
+ switch (c) {
case None:
return;
case Total:
std::string
Scroomer::get_comp_name(Component c)
{
- switch(c) {
+ switch (c) {
case TopBase:
return "TopBase";
case Handle1: