diff options
| author | John Stebbins <[email protected]> | 2015-10-13 10:11:27 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2015-10-26 08:32:38 -0700 |
| commit | dc7c7ac97c0fef7c3de0f8364c0512d754a945fa (patch) | |
| tree | ab1a9e9d61953b2507003bf2bf4f155c5e3bfdf4 /gtk/src/callbacks.c | |
| parent | af4bd049c5589c6d6a074bf8a50bb625a703b2ec (diff) | |
Fix bizarre custom anamorphic behavior
When "keep aspect" is unset in custom anamorphic, it was making very
uintuitive changes to PAR. This simplifies the code and makes the
behavior more sane.
Diffstat (limited to 'gtk/src/callbacks.c')
| -rw-r--r-- | gtk/src/callbacks.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 215900275..e77e90de4 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -1873,7 +1873,7 @@ set_title_settings(signal_user_data_t *ud, GhbValue *settings) if (!(keep_aspect || pic_par) || pic_par == 3) { ghb_dict_set_int(settings, "scale_height", - title->geometry.width - title->crop[0] - title->crop[1]); + title->geometry.height - title->crop[0] - title->crop[1]); } ghb_set_scale_settings(settings, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX); @@ -2501,7 +2501,7 @@ scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_check_dependency(ud, widget, NULL); ghb_clear_presets_selection(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, GHB_PIC_KEEP_WIDTH); + ghb_set_scale(ud, GHB_PIC_KEEP_WIDTH|GHB_PIC_KEEP_PAR); update_preview = TRUE; ghb_live_reset(ud); @@ -2516,7 +2516,7 @@ scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_check_dependency(ud, widget, NULL); ghb_clear_presets_selection(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT); + ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT|GHB_PIC_KEEP_PAR); update_preview = TRUE; ghb_live_reset(ud); @@ -2532,7 +2532,7 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_check_dependency(ud, widget, NULL); ghb_clear_presets_selection(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, 0); + ghb_set_scale(ud, GHB_PIC_KEEP_PAR); update_preview = TRUE; ghb_live_reset(ud); @@ -2562,7 +2562,7 @@ display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_clear_presets_selection(ud); ghb_live_reset(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_HEIGHT); + ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_HEIGHT|GHB_PIC_KEEP_PAR); update_preview = TRUE; } @@ -2590,7 +2590,7 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_clear_presets_selection(ud); ghb_live_reset(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, 0); + ghb_set_scale(ud, GHB_PIC_KEEP_PAR); update_preview = TRUE; update_aspect_info(ud); @@ -2604,7 +2604,7 @@ show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_check_dependency(ud, widget, NULL); ghb_live_reset(ud); if (gtk_widget_is_sensitive(widget)) - ghb_set_scale(ud, 0); + ghb_set_scale(ud, GHB_PIC_KEEP_PAR); ghb_pref_save(ud->prefs, "preview_show_crop"); update_preview = TRUE; } |