mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixing up some of the calls for frameselection to setting mousedown state

This commit is contained in:
mjudge%netscape.com 2000-05-13 08:09:03 +00:00
Родитель 95a2585ecc
Коммит 4d87ea0999
2 изменённых файлов: 34 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

37
layout/generic/nsFrame.cpp
Просмотреть файл

@ -798,41 +798,38 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
}break;
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
nsFrameState state;
GetFrameState(&state);
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
frameselection = do_QueryInterface(selCon); //this MAY implement
}
if (!frameselection)
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
if (NS_SUCCEEDED(rv) && frameselection)
{
frameselection->SetMouseDownState( PR_TRUE );//not important if it fails here
if (state & NS_FRAME_INDEPENDENT_SELECTION)
frameselection = do_QueryInterface(selCon); //this MAY implement
else
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
}
NS_ENSURE_TRUE(frameselection, NS_ERROR_FAILURE);
frameselection->SetMouseDownState( PR_TRUE );//redandant in normal cases but we MUST tell this selection by hand here
HandlePress(aPresContext, aEvent, aEventStatus);
}break;
case NS_MOUSE_LEFT_BUTTON_UP:
{
nsFrameState state;
GetFrameState(&state);
if (state & NS_FRAME_INDEPENDENT_SELECTION)
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
if (state & NS_FRAME_INDEPENDENT_SELECTION)
frameselection = do_QueryInterface(selCon); //this MAY implement
}
if (!frameselection)
return NS_ERROR_FAILURE;
if (NS_SUCCEEDED(rv) && frameselection)
{
frameselection->SetMouseDownState( PR_FALSE );//redandant in normal cases but we MUST tell this selection by hand here
}
else
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
}
NS_ENSURE_TRUE(frameselection, NS_ERROR_FAILURE);
frameselection->SetMouseDownState( PR_FALSE );//redandant in normal cases but we MUST tell this selection by hand here
HandleRelease(aPresContext, aEvent, aEventStatus);
}
break;

37
layout/html/base/src/nsFrame.cpp
Просмотреть файл

@ -798,41 +798,38 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
}break;
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
nsFrameState state;
GetFrameState(&state);
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
frameselection = do_QueryInterface(selCon); //this MAY implement
}
if (!frameselection)
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
if (NS_SUCCEEDED(rv) && frameselection)
{
frameselection->SetMouseDownState( PR_TRUE );//not important if it fails here
if (state & NS_FRAME_INDEPENDENT_SELECTION)
frameselection = do_QueryInterface(selCon); //this MAY implement
else
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
}
NS_ENSURE_TRUE(frameselection, NS_ERROR_FAILURE);
frameselection->SetMouseDownState( PR_TRUE );//redandant in normal cases but we MUST tell this selection by hand here
HandlePress(aPresContext, aEvent, aEventStatus);
}break;
case NS_MOUSE_LEFT_BUTTON_UP:
{
nsFrameState state;
GetFrameState(&state);
if (state & NS_FRAME_INDEPENDENT_SELECTION)
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
nsCOMPtr<nsIFrameSelection> frameselection;
nsCOMPtr<nsISelectionController> selCon;
rv = GetSelectionController(aPresContext, getter_AddRefs(selCon));
if (NS_SUCCEEDED(rv) && selCon)
{
if (state & NS_FRAME_INDEPENDENT_SELECTION)
frameselection = do_QueryInterface(selCon); //this MAY implement
}
if (!frameselection)
return NS_ERROR_FAILURE;
if (NS_SUCCEEDED(rv) && frameselection)
{
frameselection->SetMouseDownState( PR_FALSE );//redandant in normal cases but we MUST tell this selection by hand here
}
else
rv = shell->GetFrameSelection(getter_AddRefs(frameselection));
}
NS_ENSURE_TRUE(frameselection, NS_ERROR_FAILURE);
frameselection->SetMouseDownState( PR_FALSE );//redandant in normal cases but we MUST tell this selection by hand here
HandleRelease(aPresContext, aEvent, aEventStatus);
}
break;