diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:39 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:39 +0200 |
| commit | 4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (patch) | |
| tree | fc8426e57068733d7df20fc3a963f11cd864f079 /src/editing_tools | |
| parent | 0d64f78a02829282cd00dd6df691df08d29ed751 (diff) | |
Imported Upstream version 0.23.1upstream/0.23.1
Diffstat (limited to 'src/editing_tools')
| -rw-r--r-- | src/editing_tools/EditingTools.vala | 20 | ||||
| -rw-r--r-- | src/editing_tools/StraightenTool.vala | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala index 6c91011..c61a38c 100644 --- a/src/editing_tools/EditingTools.vala +++ b/src/editing_tools/EditingTools.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2015 Yorba Foundation +/* Copyright 2016 Software Freedom Conservancy Inc. * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -989,12 +989,6 @@ public class CropTool : EditingTool { crop_tool_window.get_size(out crop_tool_window.normal_width, out crop_tool_window.normal_height); - int window_x_pos = 0; - int window_y_pos = 0; - crop_tool_window.get_position(out window_x_pos, out window_y_pos); - - crop_tool_window.hide(); - crop_tool_window.layout.remove(crop_tool_window.constraint_combo); crop_tool_window.layout.remove(crop_tool_window.pivot_reticle_button); crop_tool_window.layout.remove(crop_tool_window.response_layout); @@ -1015,7 +1009,6 @@ public class CropTool : EditingTool { } custom_aspect_ratio = ((float) custom_init_width) / ((float) custom_init_height); - crop_tool_window.move(window_x_pos, window_y_pos); crop_tool_window.show_all(); constraint_mode = ConstraintMode.CUSTOM; @@ -1025,12 +1018,6 @@ public class CropTool : EditingTool { if (constraint_mode == ConstraintMode.NORMAL) return; - int window_x_pos = 0; - int window_y_pos = 0; - crop_tool_window.get_position(out window_x_pos, out window_y_pos); - - crop_tool_window.hide(); - crop_tool_window.layout.remove(crop_tool_window.constraint_combo); crop_tool_window.layout.remove(crop_tool_window.custom_width_entry); crop_tool_window.layout.remove(crop_tool_window.custom_mulsign_label); @@ -1045,7 +1032,6 @@ public class CropTool : EditingTool { crop_tool_window.resize(crop_tool_window.normal_width, crop_tool_window.normal_height); - crop_tool_window.move(window_x_pos, window_y_pos); crop_tool_window.show_all(); constraint_mode = ConstraintMode.NORMAL; @@ -1156,11 +1142,7 @@ public class CropTool : EditingTool { base.activate(canvas); - // make sure the window has its regular size before going into - // custom mode, which will resize it and needs to save the old - // size first. crop_tool_window.show_all(); - crop_tool_window.hide(); // was 'custom' the most-recently-chosen menu item? if(!canvas.get_photo().has_crop()) { diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala index e2b117e..f869739 100644 --- a/src/editing_tools/StraightenTool.vala +++ b/src/editing_tools/StraightenTool.vala @@ -1,5 +1,5 @@ -/* Copyright 2009-2015 Yorba Foundation +/* Copyright 2016 Software Freedom Conservancy Inc. * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. |