🎉 improve the plugin list interface a bit

Author: vanyle

editor/src/editorinterface.rs

@@ -258,6 +258,11 @@ impl EditorState {
         let ctx = platform.context();
 
         draw_editor_menu(self, &ctx);
+
+        if self.project.borrow().is_none() {
+            draw_empty_screen(self, &ctx);
+        }
+
         draw_editor_console(self, &ctx);
         draw_editor_resources(self, painter, &ctx);
         draw_editor_watcher(self, &ctx);
@@ -266,10 +271,6 @@ impl EditorState {
         draw_editor_plugin_manager(self, &ctx);
         draw_editor_preferences(self, &ctx);
 
-        if self.project.borrow().is_none() {
-            draw_empty_screen(self, &ctx);
-        }
-
         // Stop drawing the egui frame and get the full output
         let full_output = platform.end_frame(&mut self.video.borrow_mut());
         match full_output {

editor/src/editorinterface/editorplugins.rs

@@ -1,10 +1,13 @@
 use std::{borrow::Cow, fs};
 
-use egui_extras::{Column, TableBuilder};
+use egui_extras::{Column, TableBody, TableBuilder};
 use runtime::egui;
 
 use crate::{
-    editorinterface::{EditorState, extra::geteditorpaths::get_editor_plugins_path},
+    editorinterface::{
+        EditorState,
+        extra::geteditorpaths::{get_editor_plugins_path, get_end_of_path},
+    },
     pluginsystem::trustedplugin::{self, PluginEntry, TrustedPlugin},
 };
 
@@ -13,13 +16,18 @@ pub fn draw_editor_plugin_manager(editor: &mut EditorState, ctx: &egui::Context)
 
     if editor.config.borrow().is_plugins_window_shown {
         let window = egui::Window::new("Plugin manager")
-            .default_height(200.0)
-            .default_width(300.0)
+            .resizable(true)
+            .default_height(300.0)
+            .default_width(500.0)
             .open(&mut is_shown)
             .collapsible(false)
             .vscroll(false);
         let response = window.show(ctx, |ui| {
-            draw_editor_plugin_manager_content(editor, ui);
+            egui::ScrollArea::both()
+                .auto_shrink([true; 2])
+                .show(ui, |ui| {
+                    draw_editor_plugin_manager_content(editor, ui);
+                });
         });
         if let Some(response) = response {
             let on_top = Some(response.response.layer_id) == ctx.top_layer_id();
@@ -34,8 +42,8 @@ pub fn draw_editor_plugin_manager(editor: &mut EditorState, ctx: &egui::Context)
 
 fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::Ui) {
     ui.horizontal(|ui|{
-        if ui.button("Open plugin folder")
-            .on_hover_text("Open the folder where plugins are stored. You can add plugins there and they will appear in the list of available plugins.")
+        if ui.button("Open plugins folder")
+            .on_hover_text("Open the folder where plugins are stored. You can add plugins there and they will appear in the list of trusted plugins.")
             .clicked(){
                 let plugin_library_path = get_editor_plugins_path();
                 if !plugin_library_path.exists() {
@@ -54,15 +62,17 @@ fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::U
     if plugins.is_empty() {
         ui.label("No plugins found").on_hover_text("Plugins are programs that extend Vectarine's functionality. They are files ending with '.vecta.plugin'. You can download plugins or create them using the template provided by Vectarine GitHub repository.");
     } else {
+        ui.heading("Trusted plugins").on_hover_text("Trusted plugins are the list of plugins known to the editor. Only trusted plugins of a game are loaded and executed. To be trusted, a plugin needs to be inside the plugins folder of the editor");
+
         let available_height = ui.available_height();
         let table = TableBuilder::new(ui)
             .striped(true)
             .resizable(true)
-            .auto_shrink(false)
+            .auto_shrink(true)
             .cell_layout(egui::Layout::left_to_right(egui::Align::Center))
             .column(Column::auto()) // Name
-            .column(Column::auto().at_most(100.0).clip(true)) // Path
-            .column(Column::auto()) // About (description, version, url, errors, supported platforms, ...)
+            .column(Column::auto().at_most(200.0).clip(true)) // Path
+            .column(Column::auto().resizable(true)) // About (description, version, url, errors, supported platforms, ...)
             .column(Column::auto()) // Supported platforms
             .column(Column::auto()) // Actions
             .min_scrolled_height(0.0)
@@ -72,7 +82,7 @@ fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::U
                 ui.label("Name");
             });
             header.col(|ui| {
-                ui.label("Path");
+                ui.label("Filename");
             });
             header.col(|ui| {
                 ui.label("Description");
@@ -89,9 +99,7 @@ fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::U
                 let row_height = 20.0;
                 match plugin {
                     PluginEntry::Trusted(trusted_plugin) => {
-                        body.row(row_height, |mut row| {
-                            draw_trusted_plugin_row(&mut row, trusted_plugin);
-                        });
+                        draw_trusted_plugin_row(&mut body, trusted_plugin);
                     }
                     PluginEntry::Malformed(malformed) => {
                         let filename = malformed
@@ -104,7 +112,12 @@ fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::U
                                 ui.label(filename);
                             });
                             row.col(|ui| {
-                                ui.label(malformed.path.to_string_lossy());
+                                let path_shown = &malformed
+                                    .path
+                                    .file_name()
+                                    .map(|p| p.display().to_string())
+                                    .unwrap_or_else(|| get_end_of_path(&malformed.path));
+                                ui.label(path_shown);
                             });
                             row.col(|ui| {
                                 ui.label(&malformed.error);
@@ -121,28 +134,77 @@ fn draw_editor_plugin_manager_content(editor: &mut EditorState, ui: &mut egui::U
             }
         });
     }
+
+    ui.heading("Game plugins")
+        .on_hover_text("Game plugins are the list of plugins belonging to the current game. Only trusted plugins are actually loaded and executed.");
+
+    let project = editor.project.borrow();
+    if let Some(_project) = &project.as_ref() {
+        if ui
+            .button("Open game plugin folder")
+            .on_hover_text("Open the folder with the plugins specific to your project")
+            .clicked()
+        {
+            // ...
+        }
+    } else {
+        ui.label("No project loaded")
+            .on_hover_text("Load a project to see its plugins.");
+    }
 }
 
-fn draw_trusted_plugin_row(row: &mut egui_extras::TableRow, plugin: &mut TrustedPlugin) {
-    row.col(|ui| {
-        ui.label(&plugin.name);
-    });
-    row.col(|ui| {
-        ui.label(plugin.path.to_string_lossy());
-    });
-    row.col(|ui| {
-        ui.label(&plugin.description);
-    });
-    row.col(|ui| {
-        let supported_platforms = plugin
-            .supported_platforms
-            .iter()
-            .map(|platform| format!("{}", platform))
-            .collect::<Vec<_>>()
-            .join(", ");
-        ui.label(supported_platforms);
+fn draw_trusted_plugin_row(body: &mut TableBody, plugin: &mut TrustedPlugin) {
+    let ui = body.ui_mut();
+    let font_id = egui::TextStyle::Body.resolve(ui.style());
+
+    let description_width = body.widths()[2];
+
+    let ui = body.ui_mut();
+    let galley = ui.fonts(|f| {
+        f.layout_job(egui::text::LayoutJob::simple(
+            plugin.description.clone(),
+            font_id,
+            ui.visuals().text_color(),
+            description_width,
+        ))
     });
-    row.col(|ui| {
-        ui.label("Actions");
+
+    let row_height = galley.size().y + 8.0;
+
+    body.row(row_height, |mut row| {
+        row.col(|ui| {
+            if ui.link(&plugin.name).on_hover_text(&plugin.url).clicked() {
+                // For safety reasons, we're not opening a file
+                if plugin.url.starts_with("http") {
+                    let _ = open::that(&plugin.url);
+                }
+            }
+        });
+        row.col(|ui| {
+            let path_shown = &plugin
+                .path
+                .file_name()
+                .map(|p| p.display().to_string())
+                .unwrap_or_else(|| get_end_of_path(&plugin.path));
+            ui.label(path_shown);
+        });
+        row.col(|ui| {
+            let label = egui::Label::new(&plugin.description).wrap();
+            ui.add(label);
+        });
+        row.col(|ui| {
+            let supported_platforms = plugin
+                .supported_platforms
+                .iter()
+                .map(|platform| format!("{}", platform))
+                .collect::<Vec<_>>()
+                .join(", ");
+            ui.label(supported_platforms);
+        });
+        row.col(|ui| {
+            if ui.button("Add to game").clicked() {
+                // ...
+            }
+        });
     });
 }

editor/src/editorinterface/emptyscreen.rs

@@ -14,7 +14,7 @@ use runtime::{
 
 use crate::editorinterface::{
     EditorState, emptyscreen::createproject::create_game_and_open_it,
-    geteditorpaths::get_gallery_path,
+    extra::geteditorpaths::get_end_of_path, geteditorpaths::get_gallery_path,
 };
 
 pub mod createproject;
@@ -103,17 +103,6 @@ pub fn draw_empty_screen_window_content(
     });
 }
 
-pub fn get_end_of_path(path: &Path) -> String {
-    // Show last 5 components of the path.
-    let components = path.components().collect::<Vec<_>>();
-    let end_of_path = &components
-        [std::cmp::max(0, components.len().saturating_sub(5))..components.len()]
-        .iter()
-        .map(|c| PathBuf::from(c.as_os_str()))
-        .fold(PathBuf::new(), |a, b| a.join(b));
-    format!("{}", end_of_path.display())
-}
-
 pub fn draw_new_game_window_content(
     state: &mut EditorState,
     ui: &mut egui::Ui,

editor/src/editorinterface/extra/geteditorpaths.rs

@@ -125,3 +125,15 @@ pub static PLUGIN_FILE_EXTENSION: &str = ".vectaplugin";
 pub fn does_path_end_with(path: &Path, suffix: &str) -> bool {
     path.to_string_lossy().ends_with(suffix)
 }
+
+/// Returns the last components of a path. Ideal for displaying long paths.
+pub fn get_end_of_path(path: &Path) -> String {
+    // Show last 5 components of the path.
+    let components = path.components().collect::<Vec<_>>();
+    let end_of_path = &components
+        [std::cmp::max(0, components.len().saturating_sub(5))..components.len()]
+        .iter()
+        .map(|c| PathBuf::from(c.as_os_str()))
+        .fold(PathBuf::new(), |a, b| a.join(b));
+    format!("{}", end_of_path.display())
+}

vectarine-plugin-template/manifest.toml

@@ -1,4 +1,4 @@
 name = "Plugin template"
 description = """A demo plugin that squares a number."""
 version = 1
-url = "https://github.com/vanyle/vectarine/"
+url = "https://github.com/vanyle/vectarine/tree/main/vectarine-plugin-template"