← Back to branch summary

~jeremywootten/pantheon-files/ctest-widgets-part9

« back to all changes in this revision

Viewing changes to src/View/Widgets/AbstractEditableLabel.vala

  • Committer: Jeremy Wootten
  • Date: 2017-02-27 15:49:22 UTC
  • mfrom: (2513.1.1 ctest-widgets-part4)
  • Revision ID: jeremy@elementaryos.org-20170227154922-bacaap8vgnnd63rl
Merge parent and trunk to r2512

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/Widgets/AbstractEditableLabel.vala
46
46
                     *  to commit Chinese/Japanese characters when using some input methods, without ending rename.
47
47
                     */ 
48
48
                    if (mods == 0) {
49
 
                        editing_canceled = false;
50
 
                        remove_widget (); /* also causes edited signal to be emitted by CellRenderer */
 
49
                        end_editing (false);
51
50
                        return true;
52
51
                    }
53
52
 
54
53
                    break;
55
54
 
56
55
                case Gdk.Key.Escape:
57
 
                    editing_canceled = true;
58
 
                    remove_widget (); /* also causes edited signal to be emitted by CellRenderer */
 
56
                    end_editing (true);
59
57
                    return true;
60
58
 
61
59
                case Gdk.Key.z:
72
70
            return false;
73
71
        }
74
72
 
 
73
        public void end_editing (bool cancelled) {
 
74
            editing_canceled = cancelled;
 
75
            remove_widget ();
 
76
            editing_done ();
 
77
        }
75
78
 
76
79
        public virtual void set_text (string text) {
77
80
            original_name = text;