close tooltip after Active.action, to make it look more interactive (notably due to lack of dynamic update);
authorwenzelm
Wed, 16 Jan 2013 21:09:29 +0100
changeset 50915 12de8ea66f54
parent 50914 fe4714886d92
child 50916 fd902b616b48
close tooltip after Active.action, to make it look more interactive (notably due to lack of dynamic update);
src/Tools/jEdit/src/document_view.scala
src/Tools/jEdit/src/pretty_text_area.scala
src/Tools/jEdit/src/pretty_tooltip.scala
src/Tools/jEdit/src/rich_text_area.scala
--- a/src/Tools/jEdit/src/document_view.scala	Wed Jan 16 20:41:29 2013 +0100
+++ b/src/Tools/jEdit/src/document_view.scala	Wed Jan 16 21:09:29 2013 +0100
@@ -70,7 +70,7 @@
   def get_rendering(): Rendering = Rendering(model.snapshot(), PIDE.options.value)
 
   val rich_text_area =
-    new Rich_Text_Area(text_area.getView, text_area, get_rendering _,
+    new Rich_Text_Area(text_area.getView, text_area, get_rendering _, () => (),
       caret_visible = true, hovering = false)
 
 
--- a/src/Tools/jEdit/src/pretty_text_area.scala	Wed Jan 16 20:41:29 2013 +0100
+++ b/src/Tools/jEdit/src/pretty_text_area.scala	Wed Jan 16 21:09:29 2013 +0100
@@ -55,6 +55,7 @@
 class Pretty_Text_Area(
   view: View,
   background: Option[Color] = None,
+  close_action: () => Unit = () => (),
   propagate_keys: Boolean = false) extends JEditEmbeddedTextArea
 {
   text_area =>
@@ -71,7 +72,7 @@
   private var future_rendering: Option[java.util.concurrent.Future[Unit]] = None
 
   private val rich_text_area =
-    new Rich_Text_Area(view, text_area, () => current_rendering,
+    new Rich_Text_Area(view, text_area, () => current_rendering, close_action,
       caret_visible = false, hovering = true)
 
   def refresh()
--- a/src/Tools/jEdit/src/pretty_tooltip.scala	Wed Jan 16 20:41:29 2013 +0100
+++ b/src/Tools/jEdit/src/pretty_tooltip.scala	Wed Jan 16 21:09:29 2013 +0100
@@ -55,7 +55,8 @@
 
   /* pretty text area */
 
-  val pretty_text_area = new Pretty_Text_Area(view, Some(rendering.tooltip_color), true)
+  val pretty_text_area =
+    new Pretty_Text_Area(view, Some(rendering.tooltip_color), () => window.dispose(), true)
   pretty_text_area.resize(Rendering.font_family(),
     Rendering.font_size("jedit_tooltip_font_scale").round)
   pretty_text_area.update(rendering.snapshot, results, body)
--- a/src/Tools/jEdit/src/rich_text_area.scala	Wed Jan 16 20:41:29 2013 +0100
+++ b/src/Tools/jEdit/src/rich_text_area.scala	Wed Jan 16 21:09:29 2013 +0100
@@ -27,6 +27,7 @@
   view: View,
   text_area: TextArea,
   get_rendering: () => Rendering,
+  close_action: () => Unit,
   caret_visible: Boolean,
   hovering: Boolean)
 {
@@ -158,7 +159,9 @@
           case None =>
         }
         active_area.text_info match {
-          case Some((text, Text.Info(_, markup))) => Active.action(view, text, markup)
+          case Some((text, Text.Info(_, markup))) =>
+            Active.action(view, text, markup)
+            close_action()
           case None =>
         }
       }