Re-add find to BrowserTabUserControl

cefsharp · Jul 1, 2014 · 6ed6662 · 6ed6662
1 parent 63f90b5
commit 6ed6662
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 5 deletions.
diff --git a/CefSharp.WinForms.Example/BrowserForm.cs b/CefSharp.WinForms.Example/BrowserForm.cs
@@ -53,10 +53,13 @@ private void AboutToolStripMenuItemClick(object sender, EventArgs e)
 
         private void FindMenuItemClick(object sender, EventArgs e)
         {
-
+            var control = GetCurrentTabControl();
+            if (control != null)
+            {
+                control.ShowFind();
+            }
         }
 
-
         private void CopySourceToClipBoardAsyncClick(object sender, EventArgs e)
         {
             var control = GetCurrentTabControl();

diff --git a/CefSharp.WinForms.Example/BrowserTabUserControl.Designer.cs b/CefSharp.WinForms.Example/BrowserTabUserControl.Designer.cs
diff --git a/CefSharp.WinForms.Example/BrowserTabUserControl.cs b/CefSharp.WinForms.Example/BrowserTabUserControl.cs
@@ -28,6 +28,13 @@ public BrowserTabUserControl()
 
             var version = String.Format("Chromium: {0}, CEF: {1}, CefSharp: {2}", Cef.ChromiumVersion, Cef.CefVersion, Cef.CefSharpVersion);
             DisplayOutput(version);
+
+            Load += BrowserTabUserControlLoad;
+        }
+
+        private void BrowserTabUserControlLoad(object sender, EventArgs e)
+        {
+            ToggleBottomToolStrip();
         }
 
         private void OnBrowserConsoleMessage(object sender, ConsoleMessageEventArgs args)
@@ -145,5 +152,57 @@ public void CopySourceToClipBoardAsync()
             },
             TaskScheduler.FromCurrentSynchronizationContext());
         }
+
+        private void ToggleBottomToolStrip()
+        {
+            if (toolStripContainer.BottomToolStripPanelVisible)
+            {
+                browser.StopFinding(true);
+                toolStripContainer.BottomToolStripPanelVisible = false;
+            }
+            else
+            {
+                toolStripContainer.BottomToolStripPanelVisible = true;
+                findTextBox.Focus();
+            }
+        }
+
+        private void FindNextButtonClick(object sender, EventArgs e)
+        {
+            Find(true);
+        }
+
+        private void FindPreviousButtonClick(object sender, EventArgs e)
+        {
+            Find(false);
+        }
+
+        private void Find(bool next)
+        {
+            if (!string.IsNullOrEmpty(findTextBox.Text))
+            {
+                browser.Find(0, findTextBox.Text, next, false, false);
+            }
+        }
+
+        private void FindTextBoxKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter)
+            {
+                return;
+            }
+
+            Find(true);
+        }
+
+        public void ShowFind()
+        {
+            ToggleBottomToolStrip();
+        }
+
+        private void FindCloseButtonClick(object sender, EventArgs e)
+        {
+            ToggleBottomToolStrip();
+        }
     }
 }
diff --git a/CefSharp.WinForms.Example/BrowserTabUserControl.resx b/CefSharp.WinForms.Example/BrowserTabUserControl.resx
@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
 </root>