NotAlexNoyle/ColorPicker
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement 'Easier way on working pixelwise' (issue #36)

Browse Source
This commit is contained in:
RonnyDo committed 2018-05-03 10:51:35 -05:00
1 parent 24f9e217f0
commit 784efe70b8
2 files changed
+33 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ColorPickerWindow.vala
+1 -1
View File
@@ -85,7 +85,7 @@ namespace ColorPicker {
color_format_combobox.append_text ("rgba");
color_format_combobox.append_text ("Gdk RGBA");
color_format_combobox.append_text ("Qt rgba");
color_format_combobox.active = settings.color_format_index;
color_format_combobox.active = settings.color_format_index;
var adjust_button = new Gtk.Button.from_icon_name ("media-eq-symbolic");
adjust_button.margin_start = 12;
src/Widgets/Picker.vala
+32 -4
View File
@@ -34,6 +34,9 @@ namespace ColorPicker.Widgets {
const string bright_border_color_string = "#FFFFFF";
private Gdk.RGBA bright_border_color = Gdk.RGBA();
private int mouse_pos_x = 0;
private int mouse_pos_y = 0;
// 1. Snapsize is the amount of pixel going to be magnified by the zoomlevel.
// 2. The snapsize must be odd to have a 1px magnifier center.
// 3. Asure that snapsize*max_zoomlevel+shadow_width*2 is smaller than 2 * get_screen ().get_display ().get_maximal_cursor_size()
@@ -77,9 +80,11 @@ namespace ColorPicker.Widgets {
public override bool button_release_event (Gdk.EventButton e) {
// button_1 is left mouse button
if (e.button == 1) {
Gdk.RGBA color = get_color_at ((int) e.x_root, (int) e.y_root);
picked (color);
// button_3 is right mouse button
} else if (e.button == 3) {
cancelled ();
}
@@ -93,8 +98,9 @@ namespace ColorPicker.Widgets {
}
public override bool motion_notify_event (Gdk.EventMotion e) {
public override bool motion_notify_event (Gdk.EventMotion e) {
Gdk.RGBA color = get_color_at ((int) e.x_root, (int) e.y_root);
moved (color);
set_magnifier_cursor ();
@@ -237,10 +243,32 @@ namespace ColorPicker.Widgets {
public override bool key_press_event (Gdk.EventKey e) {
if (e.keyval == Gdk.Key.Escape) {
cancelled ();
int px, py;
get_pointer (out px, out py);
var manager = Gdk.Display.get_default ().get_device_manager ();
switch (e.keyval) {
case Gdk.Key.Escape:
cancelled ();
break;
case Gdk.Key.Return:
Gdk.RGBA color = get_color_at (px, py);
picked (color);
break;
case Gdk.Key.Up:
manager.get_client_pointer ().warp (get_screen (), px, py - 1);
break;
case Gdk.Key.Down:
manager.get_client_pointer ().warp (get_screen (), px, py + 1);
break;
case Gdk.Key.Left:
manager.get_client_pointer ().warp (get_screen (), px - 1, py);
break;
case Gdk.Key.Right:
manager.get_client_pointer ().warp (get_screen (), px + 1, py);
break;
}
return true;
}