Commit 3913abc8 authored by Allison Barlow's avatar Allison Barlow

fixes #1762 Black screen after full screen and #1763 Photos with blank...

fixes #1762 Black screen after full screen and #1763 Photos with blank ImageDescriptions should be treated as no title at all
parent bfc9d066
......@@ -133,7 +133,6 @@ public class FullscreenWindow : PageWindow {
// ...then let the base class take over
return (base.key_press_event != null) ? base.key_press_event(event) : false;
}
private void on_close() {
hide_toolbar();
......
......@@ -563,7 +563,7 @@ public class PhotoRenameDialog : TextEntryDialogMediator {
}
public virtual string? execute() {
return _execute();
return _execute().strip();
}
}
......
......@@ -313,7 +313,7 @@ namespace Exif {
public string get_title(Exif.Data exif) {
Exif.Entry entry = find_first_entry(exif, Exif.Tag.IMAGE_DESCRIPTION, Exif.Format.ASCII);
return (entry != null) ? entry.get_string() : "";
return (entry != null) ? entry.get_string().strip() : "";
}
public void set_title(Exif.Data exif, string title) {
......
......@@ -326,6 +326,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
public override void returning_from_fullscreen() {
base.returning_from_fullscreen();
repaint();
if (controller != null)
controller.items_selected -= on_selection_changed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment