From 03b34931383e701c39c653a7662a616fe21a0947 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 14 Oct 2021 16:07:22 +0700
Subject: Remove trait-specific draw logic in `iced_native`

---
 native/src/widget/pane_grid/content.rs   | 53 +++++++++++++++---------------
 native/src/widget/pane_grid/title_bar.rs | 56 ++++++++++++++++----------------
 2 files changed, 55 insertions(+), 54 deletions(-)

(limited to 'native/src/widget/pane_grid')

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index bac9fdd4..e94955f7 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -61,32 +61,33 @@ where
         layout: Layout<'_>,
         cursor_position: Point,
         viewport: &Rectangle,
-    ) -> Renderer::Output {
-        if let Some(title_bar) = &self.title_bar {
-            let mut children = layout.children();
-            let title_bar_layout = children.next().unwrap();
-            let body_layout = children.next().unwrap();
-
-            renderer.draw_pane(
-                defaults,
-                layout.bounds(),
-                &self.style,
-                Some((title_bar, title_bar_layout)),
-                (&self.body, body_layout),
-                cursor_position,
-                viewport,
-            )
-        } else {
-            renderer.draw_pane(
-                defaults,
-                layout.bounds(),
-                &self.style,
-                None,
-                (&self.body, layout),
-                cursor_position,
-                viewport,
-            )
-        }
+    ) {
+        // TODO
+        // if let Some(title_bar) = &self.title_bar {
+        //     let mut children = layout.children();
+        //     let title_bar_layout = children.next().unwrap();
+        //     let body_layout = children.next().unwrap();
+
+        //     renderer.draw_pane(
+        //         defaults,
+        //         layout.bounds(),
+        //         &self.style,
+        //         Some((title_bar, title_bar_layout)),
+        //         (&self.body, body_layout),
+        //         cursor_position,
+        //         viewport,
+        //     )
+        // } else {
+        //     renderer.draw_pane(
+        //         defaults,
+        //         layout.bounds(),
+        //         &self.style,
+        //         None,
+        //         (&self.body, layout),
+        //         cursor_position,
+        //         viewport,
+        //     )
+        // }
     }
 
     /// Returns whether the [`Content`] with the given [`Layout`] can be picked
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index 070010f8..9b0b7c78 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -90,34 +90,34 @@ where
         cursor_position: Point,
         viewport: &Rectangle,
         show_controls: bool,
-    ) -> Renderer::Output {
-        let mut children = layout.children();
-        let padded = children.next().unwrap();
-
-        let mut children = padded.children();
-        let title_layout = children.next().unwrap();
-
-        let controls = if let Some(controls) = &self.controls {
-            let controls_layout = children.next().unwrap();
-
-            if show_controls || self.always_show_controls {
-                Some((controls, controls_layout))
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
-        renderer.draw_title_bar(
-            defaults,
-            layout.bounds(),
-            &self.style,
-            (&self.content, title_layout),
-            controls,
-            cursor_position,
-            viewport,
-        )
+    ) {
+        // let mut children = layout.children();
+        // let padded = children.next().unwrap();
+
+        // let mut children = padded.children();
+        // let title_layout = children.next().unwrap();
+
+        // let controls = if let Some(controls) = &self.controls {
+        //     let controls_layout = children.next().unwrap();
+
+        //     if show_controls || self.always_show_controls {
+        //         Some((controls, controls_layout))
+        //     } else {
+        //         None
+        //     }
+        // } else {
+        //     None
+        // };
+
+        // renderer.draw_title_bar(
+        //     defaults,
+        //     layout.bounds(),
+        //     &self.style,
+        //     (&self.content, title_layout),
+        //     controls,
+        //     cursor_position,
+        //     viewport,
+        // )
     }
 
     /// Returns whether the mouse cursor is over the pick area of the
-- 
cgit