← Back to branch summary

~jeremywootten/pantheon-files/fix-hang-on-directory-permission-change

« back to all changes in this revision

Viewing changes to src/TextRenderer.vala

Do not end name editing when focus is lost

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/TextRenderer.vala
34
34
        int focus_border_width;
35
35
        Pango.Layout layout;
36
36
        Gtk.Widget widget;
37
 
        public Marlin.AbstractEditableLabel entry;
 
37
        Marlin.AbstractEditableLabel entry;
 
38
 
 
39
        construct {
 
40
            this.mode = Gtk.CellRendererMode.EDITABLE;
 
41
        }
38
42
 
39
43
        public TextRenderer (Marlin.ViewMode viewmode) {
40
 
            this.mode = Gtk.CellRendererMode.EDITABLE;
41
 
 
42
 
            if (viewmode == Marlin.ViewMode.ICON)
 
44
            if (viewmode == Marlin.ViewMode.ICON) {
43
45
                entry = new Marlin.MultiLineEditableLabel ();
44
 
            else
 
46
            } else {
45
47
                entry = new Marlin.SingleLineEditableLabel ();
 
48
            }
46
49
 
47
50
            entry.editing_done.connect (on_entry_editing_done);
48
 
            entry.get_real_editable ().focus_out_event.connect_after (on_entry_focus_out_event);
49
51
        }
50
52
 
51
53
        public override void get_preferred_height_for_width (Gtk.Widget widget, int width, out int minimum_size, out int natural_size) {
180
182
            return entry as Gtk.CellEditable;
181
183
        }
182
184
 
 
185
        public void end_editing (bool cancel) {
 
186
            entry.end_editing (cancel);
 
187
        }
 
188
 
183
189
        private void set_widget (Gtk.Widget? _widget) {
184
190
            Pango.FontMetrics metrics;
185
191
            Pango.Context context;
246
252
            file = null;
247
253
        }
248
254
 
249
 
        private bool on_entry_focus_out_event (Gdk.Event event) {
250
 
            on_entry_editing_done ();
251
 
            return false;
252
 
        }
253
 
 
254
255
        private void draw_focus (Cairo.Context cr,
255
256
                                 Gdk.Rectangle cell_area,
256
257
                                 Gtk.CellRendererState flags,