From b0439adee45aa13c9b1d4d56c5488c22afd09cb7 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Wed, 27 Feb 2013 14:41:53 -0600 Subject: [PATCH] Fix issue MR-339 - Connection group collapses with just one click (cherry picked from commit 0a7c88a853323b13bc48e15be6cabda690e32be5) Conflicts: CHANGELOG.TXT --- CHANGELOG.TXT | 1 + mRemoteV1/Forms/frmMain.vb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 180350b7f..9715f7f85 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,4 @@ + Fixed issue MR-339 - Connection group collapses with just one click Fixed issue MR-340 - Object reference not set to an instance of an object. Fixed issue MR-344 - Move "Always show panel tabs" option Fixed tabs not closing on double-click when the active tab is a PuTTY connection. diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb index 33a1300ef..904baa5db 100644 --- a/mRemoteV1/Forms/frmMain.vb +++ b/mRemoteV1/Forms/frmMain.vb @@ -734,8 +734,8 @@ Public Class frmMain Dim control As Control = FromChildHandle(WindowFromPoint(MousePosition)) If Not IsNothing(control) Then - ' Let ComboBoxes get focus but don't simulate a mouse event - If TypeOf control Is ComboBox Then Exit Select + ' Let TreeViews and ComboBoxes get focus but don't simulate a mouse event + If TypeOf control Is TreeView Or TypeOf control Is ComboBox Then Exit Select If control.CanSelect Or TypeOf control Is MenuStrip Or TypeOf control Is ToolStrip Or TypeOf control Is Magic.Controls.InertButton Then ' Simulate a mouse event since one wasn't generated by Windows