| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. |
| 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 // Check if there is a selection and click is not on the | 165 // Check if there is a selection and click is not on the |
| 166 // selection. | 166 // selection. |
| 167 if (layoutObject() && layoutObject()->isSelectable() && frame->s
election().isRange() && !frame->eventHandler().selectionController().mouseDownWa
sSingleClickInSelection()) | 167 if (layoutObject() && layoutObject()->isSelectable() && frame->s
election().isRange() && !frame->eventHandler().selectionController().mouseDownWa
sSingleClickInSelection()) |
| 168 isLabelTextSelected = true; | 168 isLabelTextSelected = true; |
| 169 // If selection is there and is single click i.e. text is | 169 // If selection is there and is single click i.e. text is |
| 170 // selected by dragging over label text, then return. | 170 // selected by dragging over label text, then return. |
| 171 // Click count >=2, meaning double click or triple click, | 171 // Click count >=2, meaning double click or triple click, |
| 172 // should pass click event to control element. | 172 // should pass click event to control element. |
| 173 // Only in case of drag, *neither* we pass the click event, | 173 // Only in case of drag, *neither* we pass the click event, |
| 174 // *nor* we focus the control element. | 174 // *nor* we focus the control element. |
| 175 if (isLabelTextSelected && frame->eventHandler().clickCount() ==
1) | 175 if (isLabelTextSelected && toMouseEvent(evt)->clickCount() == 1) |
| 176 return; | 176 return; |
| 177 } | 177 } |
| 178 } | 178 } |
| 179 | 179 |
| 180 m_processingClick = true; | 180 m_processingClick = true; |
| 181 | 181 |
| 182 document().updateStyleAndLayoutIgnorePendingStylesheets(); | 182 document().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 183 if (element->isMouseFocusable()) { | 183 if (element->isMouseFocusable()) { |
| 184 // If the label is *not* selected, or if the click happened on | 184 // If the label is *not* selected, or if the click happened on |
| 185 // selection of label, only then focus the control element. | 185 // selection of label, only then focus the control element. |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 222 |
| 223 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) | 223 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) |
| 224 { | 224 { |
| 225 if (HTMLElement* element = control()) | 225 if (HTMLElement* element = control()) |
| 226 element->accessKeyAction(sendMouseEvents); | 226 element->accessKeyAction(sendMouseEvents); |
| 227 else | 227 else |
| 228 HTMLElement::accessKeyAction(sendMouseEvents); | 228 HTMLElement::accessKeyAction(sendMouseEvents); |
| 229 } | 229 } |
| 230 | 230 |
| 231 } // namespace blink | 231 } // namespace blink |
| OLD | NEW |