Ticket #46640: 46640.2.diff

src/wp-admin/css/edit.css

@@ -1273 +1273 @@
 /* DFW 2
 -------------------------------------------------------------- */
 
-#wp-content-wrap .mce-wp-dfw,
 #qt_content_dfw {
         display: none;
 }
 
-.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
 .wp-editor-expand #qt_content_dfw {
         display: inline-block;
 }

src/wp-includes/class-wp-editor.php

@@ -583 +583 @@
                                 $mce_buttons   = apply_filters( 'teeny_mce_buttons', array( 'bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'fullscreen' ), $editor_id );
                                 $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
                         } else {
-                                $mce_buttons = array( 'formatselect', 'bold', 'italic', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'link', 'wp_more', 'spellchecker' );
+                                $mce_buttons = array( 'formatselect', 'bold', 'italic', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'link', 'wp_more', 'spellchecker', 'wp_adv' );
 
                                 if ( ! wp_is_mobile() ) {
                                         if ( $set['_content_editor_dfw'] ) {
+                                                // When the distraction-free functionality is available, add its button at the last position.
                                                 $mce_buttons[] = 'dfw';
                                         } else {
-                                                $mce_buttons[] = 'fullscreen';
+                                                /*
+                                                 * Otherwise, when the distraction-free functionality is not available
+                                                 * for example because disabled via the `wp_editor_expand` filter, add
+                                                 * the TinyMCE "Fullscreen" button before the "Toolbar Toggle" button.
+                                                 */
+                                                array_splice( $mce_buttons, -1, 1, array( 'fullscreen', 'wp_adv' ) );
                                         }
                                 }
 
-                                $mce_buttons[] = 'wp_adv';
-
                                 /**
                                  * Filters the first-row list of TinyMCE buttons (Visual tab).
                                  *

src/wp-includes/css/editor.css

@@ -1269 +1269 @@
         position: absolute;
         top: 0;
         right: 0;
-        margin: 5px 5px 0 0;
+        margin: 7px 7px 0 0;
 }
 
+.qt-dfw {
+        margin-top: 5px;
+}
+
 .qt-fullscreen {
         position: static;
         margin: 2px;