wpf tooltips

fengyeju · Feb 29, 2012 · ab91d46 · ab91d46
1 parent 1dc6da1
commit ab91d46
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 11 deletions.
diff --git a/CefSharp.Example/CefSharp.Example.csproj b/CefSharp.Example/CefSharp.Example.csproj
@@ -66,7 +66,7 @@
     <Content Include="Resources\BindingTest.html" />
     <Content Include="Resources\PopupTest.html" />
     <Content Include="Resources\SchemeTest.html" />
-    <Content Include="Resources\TooltipTest.html" />
+    <Content Include="Resources\TooltipsTest.html" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/CefSharp.Example/ExamplePresenter.cs b/CefSharp.Example/ExamplePresenter.cs
@@ -20,6 +20,7 @@ public static void Init()
         private const string resource_url = "http://test/resource/load";
         private const string scheme_url = "test://test/SchemeTest.html";
         private const string bind_url = "test://test/BindingTest.html";
+        private const string tooltips_url = "test://test/TooltipsTest.html";
 
         private int color_index = 0;
         private readonly string[] colors =
@@ -54,6 +55,7 @@ public ExamplePresenter(IWebBrowser model, IExampleView view,
             this.view.TestEvaluateScriptActivated += view_TestEvaluateScriptActivated;
             this.view.TestBindActivated += view_TestBindActivated;
             this.view.TestConsoleMessageActivated += view_TestConsoleMessageActivated;
+            this.view.TestTooltipsActivated += view_TestTooltipsActivated;
             this.view.ExitActivated += view_ExitActivated;
         }
 
@@ -157,6 +159,11 @@ private void view_TestConsoleMessageActivated(object sender, EventArgs e)
             view.ExecuteScript(script);
         }
 
+        private void view_TestTooltipsActivated(object sender, EventArgs e)
+        {
+            model.Load(tooltips_url);
+        }
+
         private void view_ExitActivated(object sender, EventArgs e)
         {
             CEF.Shutdown();

diff --git a/CefSharp.Example/IExampleView.cs b/CefSharp.Example/IExampleView.cs
@@ -13,6 +13,7 @@ public interface IExampleView
         event EventHandler TestEvaluateScriptActivated;
         event EventHandler TestBindActivated;
         event EventHandler TestConsoleMessageActivated;
+        event EventHandler TestTooltipsActivated;
         event EventHandler ExitActivated;
 
         void SetTitle(string title);

diff --git a/CefSharp.Example/Properties/Resources.Designer.cs b/CefSharp.Example/Properties/Resources.Designer.cs
diff --git a/CefSharp.Example/Properties/Resources.resx b/CefSharp.Example/Properties/Resources.resx
@@ -127,7 +127,7 @@
   <data name="SchemeTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SchemeTest.html;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="TooltipTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TooltipTest.html;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="TooltipsTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TooltipsTest.html;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>
diff --git a/CefSharp.Example/Resources/TooltipTest.html → CefSharp.Example/Resources/TooltipsTest.html b/CefSharp.Example/Resources/TooltipTest.html → CefSharp.Example/Resources/TooltipsTest.html
@@ -6,8 +6,8 @@
 	<body>
         <form>
         <input type="text" size=25 title="This is the first tooltip">
+        <br />
         <input type="text" size=25 title="This is the second tooltip">
-        <input type="button" value="Submit">
         </form>
 	</body>
 </html>
diff --git a/CefSharp.Example/SchemeHandler.cs b/CefSharp.Example/SchemeHandler.cs
@@ -25,7 +25,7 @@ public SchemeHandler()
                 { "BindingTest.html", Resources.BindingTest },
                 { "PopupTest.html", Resources.PopupTest },
                 { "SchemeTest.html", Resources.SchemeTest },
-                { "TooltipTest.html", Resources.TooltipTest },
+                { "TooltipsTest.html", Resources.TooltipsTest },
             };
         }
 

diff --git a/CefSharp.Test/BrowserCoreTest.cs b/CefSharp.Test/BrowserCoreTest.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+
+namespace CefSharp.Test
+{
+    [TestFixture]
+    public class BrowserCoreTest
+    {
+        private BrowserCore browser_core;
+
+        [SetUp]
+        public void SetUp()
+        {
+            browser_core = new BrowserCore();
+        }
+
+        [Test]
+        public void Test()
+        {
+            int event_count = 0;
+            browser_core.PropertyChanged += (sender, e) => event_count++;
+
+            browser_core.Tooltip = "foo";
+            browser_core.Tooltip = null;
+            browser_core.Tooltip = null;
+
+            Assert.AreEqual(2, event_count);
+        }
+    }
+}
diff --git a/CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.csproj
@@ -36,9 +36,12 @@
       <HintPath>..\nunit\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BrowserCoreTest.cs" />
     <Compile Include="BrowserTest.cs" />
     <Compile Include="Fixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/CefSharp.WinForms.Example/Browser.Designer.cs b/CefSharp.WinForms.Example/Browser.Designer.cs
diff --git a/CefSharp.WinForms.Example/Browser.cs b/CefSharp.WinForms.Example/Browser.cs
@@ -56,6 +56,12 @@ public event EventHandler TestConsoleMessageActivated
             remove { testConsoleMessageMenuItem.Click -= value; }
         }
 
+        public event EventHandler TestTooltipsActivated
+        {
+            add { testTooltipsMenuItem.Click += value; }
+            remove { testTooltipsMenuItem.Click -= value; }
+        }
+
         public event EventHandler ExitActivated
         {
             add { exitToolStripMenuItem.Click += value; }

diff --git a/CefSharp.Wpf.Example/MainWindow.xaml b/CefSharp.Wpf.Example/MainWindow.xaml
@@ -15,6 +15,7 @@
                 <MenuItem Header="Test Evaluate JavaScript" Name="testEvaluateScriptMenuItem" Click="control_Activated" />
                 <MenuItem Header="Test Bind CLR Object to JavaScript" Name="testBindMenuItem" Click="control_Activated" />
                 <MenuItem Header="Test Console Message" Name="testConsoleMessageMenuItem" Click="control_Activated" />
+                <MenuItem Header="Test Tooltips" Name="testTooltipsMenuItem" Click="control_Activated" />
             </MenuItem>
             <MenuItem Header="Bookmarks">
                 <MenuItem Header="CefSharp Home" Name="homeMenuItem" />

diff --git a/CefSharp.Wpf.Example/MainWindow.xaml.cs b/CefSharp.Wpf.Example/MainWindow.xaml.cs
@@ -22,6 +22,7 @@ public partial class MainWindow : Window, IExampleView
         public event EventHandler TestEvaluateScriptActivated;
         public event EventHandler TestBindActivated;
         public event EventHandler TestConsoleMessageActivated;
+        public event EventHandler TestTooltipsActivated;
         public event EventHandler ExitActivated;
 
         private WebView web_view;
@@ -51,6 +52,7 @@ private void Window_SourceInitialized(object sender, EventArgs e)
                 { testEvaluateScriptMenuItem, TestEvaluateScriptActivated },
                 { testBindMenuItem, TestBindActivated },
                 { testConsoleMessageMenuItem, TestConsoleMessageActivated },
+                { testTooltipsMenuItem, TestTooltipsActivated },
                 { exitMenuItem, ExitActivated },
             };
         }

diff --git a/CefSharp.Wpf/WebView.cpp b/CefSharp.Wpf/WebView.cpp
@@ -291,9 +291,19 @@ namespace Wpf
             gcnew Action<SafeFileHandle^>(this, &WebView::SetCursor), handle);
     }
 
-    void WebView::SetTooltip(String^ tooltip)
+    void WebView::SetTooltip(String^ text)
     {
-        ToolTip = tooltip;
+        _toolTip->Placement = Primitives::PlacementMode::Mouse;
+
+        if (String::IsNullOrEmpty(text))
+        {
+            _toolTip->IsOpen = false;
+        }
+        else
+        {
+            _toolTip->Content = text;
+            _toolTip->IsOpen = true;
+        }
     }
 
     void WebView::SetBuffer(int width, int height, const void* buffer)

diff --git a/CefSharp.Wpf/WebView.h b/CefSharp.Wpf/WebView.h
@@ -9,6 +9,7 @@ using namespace System::ComponentModel;
 using namespace System::Runtime::InteropServices;
 using namespace System::Windows;
 using namespace System::Windows::Controls;
+using namespace System::Windows::Controls::Primitives;
 using namespace System::Windows::Input;
 using namespace System::Windows::Interop;
 using namespace System::Windows::Media;
@@ -32,6 +33,7 @@ namespace Wpf
         MCefRefPtr<ScriptCore> _scriptCore;
 
         Image^ _image;
+        System::Windows::Controls::ToolTip^ _toolTip;
 
         int _width, _height;
         InteropBitmap^ _ibitmap;
@@ -42,7 +44,7 @@ namespace Wpf
         void WaitForInitialized();
         void BrowserCore_PropertyChanged(Object^ sender, PropertyChangedEventArgs^ e);
         void SetCursor(SafeFileHandle^ handle);
-        void SetTooltip(String^ tooltip);
+        void SetTooltip(String^ text);
         IntPtr SourceHook(IntPtr hWnd, int message, IntPtr wParam, IntPtr lParam, bool% handled);
 		void SetBitmap();
 
@@ -94,6 +96,10 @@ namespace Wpf
 			_paintDelegate = gcnew ActionDelegate(this, &WebView::SetBitmap);
             source->AddHook(gcnew Interop::HwndSourceHook(this, &WebView::SourceHook));
 
+            ToolTip = _toolTip =
+                gcnew System::Windows::Controls::ToolTip();
+            _toolTip->StaysOpen = true;
+
             HWND hWnd = static_cast<HWND>(source->Handle.ToPointer());
             CefWindowInfo window;
             window.SetAsOffScreen(hWnd);