@@ -79,7 +79,7 @@ void InfinitelyScrollableTableView::mousemove_event(GUI::MouseEvent& event)
79
79
80
80
m_is_hovering_cut_zone = false ;
81
81
m_is_hovering_extend_zone = false ;
82
- if (selection ().size () > 0 && !m_should_intercept_drag ) {
82
+ if (selection ().size () > 0 && !m_is_dragging_for_select ) {
83
83
// Get top-left and bottom-right most cells of selection
84
84
auto bottom_right_most_index = selection ().first ();
85
85
auto top_left_most_index = selection ().first ();
@@ -134,20 +134,20 @@ void InfinitelyScrollableTableView::mousemove_event(GUI::MouseEvent& event)
134
134
135
135
auto holding_left_button = !!(event.buttons () & GUI::MouseButton::Primary);
136
136
if (m_is_dragging_for_copy) {
137
- m_should_intercept_drag = false ;
137
+ m_is_dragging_for_select = false ;
138
138
if (holding_left_button) {
139
- m_has_committed_to_dragging = true ;
139
+ m_has_committed_to_cutting = true ;
140
140
}
141
- } else if (!m_should_intercept_drag ) {
141
+ } else if (!m_is_dragging_for_select ) {
142
142
if (!holding_left_button) {
143
143
m_starting_selection_index = index;
144
144
} else {
145
- m_should_intercept_drag = true ;
145
+ m_is_dragging_for_select = true ;
146
146
m_might_drag = false ;
147
147
}
148
148
}
149
149
150
- if (holding_left_button && m_should_intercept_drag && !m_has_committed_to_dragging ) {
150
+ if (holding_left_button && m_is_dragging_for_select && !m_has_committed_to_cutting ) {
151
151
if (!m_starting_selection_index.is_valid ())
152
152
m_starting_selection_index = index;
153
153
@@ -189,9 +189,9 @@ void InfinitelyScrollableTableView::mousedown_event(GUI::MouseEvent& event)
189
189
190
190
void InfinitelyScrollableTableView::mouseup_event (GUI::MouseEvent& event)
191
191
{
192
- m_should_intercept_drag = false ;
193
- m_has_committed_to_dragging = false ;
192
+ m_is_dragging_for_select = false ;
194
193
m_is_dragging_for_copy = false ;
194
+ m_has_committed_to_cutting = false ;
195
195
if (m_is_hovering_cut_zone) {
196
196
auto rect = content_rect (m_target_cell);
197
197
GUI::MouseEvent adjusted_event = { (GUI::Event::Type)event.type (), rect.center (), event.buttons (), event.button (), event.modifiers (), event.wheel_delta_x (), event.wheel_delta_y () };
0 commit comments