Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dvc-edit-right-click'

Browse Source 
Stop editing when right mouse button is pressed in wxDataViewCtrl.

See https://github.com/wxWidgets/wxWidgets/pull/1052
This commit is contained in:
Vadim Zeitlin
2018-12-08 00:52:47 +01:00
parent b12f391514 dc1aa3097c
commit 1cc6aabe09
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/datavgen.cpp
View File

@@ -4525,14 +4525,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
return; return;
} }
if(event.ButtonDown())
{
// Not skipping button down events would prevent the system from
// setting focus to this window as most (all?) of them do by default,
// so skip it to enable default handling.
event.Skip();
}
int x = event.GetX(); int x = event.GetX();
int y = event.GetY(); int y = event.GetY();
m_owner->CalcUnscrolledPosition( x, y, &x, &y ); m_owner->CalcUnscrolledPosition( x, y, &x, &y );
@@ -4560,6 +4552,20 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
const unsigned int current = GetLineAt( y ); const unsigned int current = GetLineAt( y );
const wxDataViewItem item = GetItemByRow(current); const wxDataViewItem item = GetItemByRow(current);
if(event.ButtonDown())
{
// Not skipping button down events would prevent the system from
// setting focus to this window as most (all?) of them do by default,
// so skip it to enable default handling.
event.Skip();
// Also stop editing if any mouse button is pressed: this is not really
// necessary for the left button, as it would result in a focus loss
// that would make the editor close anyhow, but we do need to do it for
// the other ones and it does no harm to do it for the left one too.
FinishEditing();
}
// Handle right clicking here, before everything else as context menu // Handle right clicking here, before everything else as context menu
// events should be sent even when we click outside of any item, unlike all // events should be sent even when we click outside of any item, unlike all
// the other ones. // the other ones.

11
src/gtk/dataview.cpp
View File

@@ -4591,11 +4591,14 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
// If the right click is on an item that isn't selected, select it, as is // If the right click is on an item that isn't selected, select it, as is
// commonly done. Do not do it if the item under mouse is already selected, // commonly done. Do not do it if the item under mouse is already selected,
// because it could be a part of multi-item selection. // because it could be a part of multi-item selection.
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView())); if ( path )
if ( !gtk_tree_selection_path_is_selected(selection, path) )
{ {
gtk_tree_selection_unselect_all(selection); GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView()));
gtk_tree_selection_select_path(selection, path); if ( !gtk_tree_selection_path_is_selected(selection, path) )
{
gtk_tree_selection_unselect_all(selection);
gtk_tree_selection_select_path(selection, path);
}
} }
wxDataViewEvent wxDataViewEvent