Small fixes split out from #1107 .

CHANGELOG.md

@@ -43,6 +43,8 @@ You can find its changes [documented below](#060---2020-06-01).
 - `WidgetExt::debug_widget_id` and `debug_paint_layout` now also apply to the widget they are called on. ([#1100] by [@finnerale])
 - X11: Fix X11 errors caused by destroyed windows. ([#1103] by [@jneem])
 - `ViewSwitcher` now skips the update after switching widgets. ([#1113] by [@finnerale])
+- Key and KeyOrValue derive Clone ([#1119] by [@rjwittams])
+- Allow submit_command from the layout method in Widgets ([#1119] by [@rjwittams])
 
 ### Visual
 

druid/src/contexts.rs

@@ -318,19 +318,6 @@ impl_context_method!(EventCtx<'_, '_>, UpdateCtx<'_, '_>, LifeCycleCtx<'_, '_>,
         self.request_layout();
     }
 
-    /// Submit a [`Command`] to be run after this event is handled.
-    ///
-    /// Commands are run in the order they are submitted; all commands
-    /// submitted during the handling of an event are executed before
-    /// the [`update`] method is called; events submitted during [`update`]
-    /// are handled after painting.
-    ///
-    /// [`Command`]: struct.Command.html
-    /// [`update`]: trait.Widget.html#tymethod.update
-    pub fn submit_command(&mut self, cmd: impl Into<Command>, target: impl Into<Option<Target>>) {
-        self.state.submit_command(cmd.into(), target.into())
-    }
-
     /// Set the menu of the window containing the current widget.
     /// `T` must be the application's root `Data` type (the type provided to [`AppLauncher::launch`]).
     ///
@@ -340,6 +327,32 @@ impl_context_method!(EventCtx<'_, '_>, UpdateCtx<'_, '_>, LifeCycleCtx<'_, '_>,
     }
 });
 
+// methods on event, update, and lifecycle
+impl_context_method!(
+    EventCtx<'_, '_>,
+    UpdateCtx<'_, '_>,
+    LifeCycleCtx<'_, '_>,
+    LayoutCtx<'_, '_>,
+    {
+        /// Submit a [`Command`] to be run after this event is handled.
+        ///
+        /// Commands are run in the order they are submitted; all commands
+        /// submitted during the handling of an event are executed before
+        /// the [`update`] method is called; events submitted during [`update`]
+        /// are handled after painting.
+        ///
+        /// [`Command`]: struct.Command.html
+        /// [`update`]: trait.Widget.html#tymethod.update
+        pub fn submit_command(
+            &mut self,
+            cmd: impl Into<Command>,
+            target: impl Into<Option<Target>>,
+        ) {
+            self.state.submit_command(cmd.into(), target.into())
+        }
+    }
+);
+
 impl EventCtx<'_, '_> {
     /// Set the cursor icon.
     ///

druid/src/env.rs

@@ -86,6 +86,7 @@ struct EnvImpl {
 ///
 /// [`ValueType`]: trait.ValueType.html
 /// [`Env`]: struct.Env.html
+#[derive(Clone)]
 pub struct Key<T> {
     key: &'static str,
     value_type: PhantomData<*const T>,
@@ -116,6 +117,7 @@ pub enum Value {
 ///
 /// [`Key<T>`]: struct.Key.html
 /// [`Env`]: struct.Env.html
+#[derive(Clone)]
 pub enum KeyOrValue<T> {
     Concrete(Value),
     Key(Key<T>),