зеркало из https://github.com/mozilla/gecko-dev.git
forward NPWindow.{x, y} properly. no windowless gfx yet, but closer. thanks=karlt
This commit is contained in:
Родитель
39379cfc8a
Коммит
c83bd901e1
|
@ -255,8 +255,9 @@ bool
|
||||||
PluginInstanceChild::AnswerNPP_SetWindow(const NPWindow& aWindow,
|
PluginInstanceChild::AnswerNPP_SetWindow(const NPWindow& aWindow,
|
||||||
NPError* rv)
|
NPError* rv)
|
||||||
{
|
{
|
||||||
printf("[PluginInstanceChild] NPP_SetWindow(%lx, %d, %d)\n",
|
printf("[PluginInstanceChild] NPP_SetWindow(%lx, %d, %d, %d x %d)\n",
|
||||||
reinterpret_cast<unsigned long>(aWindow.window),
|
reinterpret_cast<unsigned long>(aWindow.window),
|
||||||
|
aWindow.x, aWindow.y,
|
||||||
aWindow.width, aWindow.height);
|
aWindow.width, aWindow.height);
|
||||||
|
|
||||||
#if defined(OS_LINUX)
|
#if defined(OS_LINUX)
|
||||||
|
@ -266,11 +267,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPWindow& aWindow,
|
||||||
|
|
||||||
GdkNativeWindow handle = reinterpret_cast<uintptr_t>(aWindow.window);
|
GdkNativeWindow handle = reinterpret_cast<uintptr_t>(aWindow.window);
|
||||||
|
|
||||||
mWindow.window = (void*) handle;
|
mWindow = aWindow;
|
||||||
mWindow.width = aWindow.width;
|
|
||||||
mWindow.height = aWindow.height;
|
|
||||||
mWindow.type = aWindow.type;
|
|
||||||
|
|
||||||
mWsInfo.display = GDK_DISPLAY();
|
mWsInfo.display = GDK_DISPLAY();
|
||||||
|
|
||||||
// FIXME/cjones: the code below is correct, but apparently to get
|
// FIXME/cjones: the code below is correct, but apparently to get
|
||||||
|
@ -296,6 +293,8 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPWindow& aWindow,
|
||||||
SizePluginWindow(aWindow.width, aWindow.height);
|
SizePluginWindow(aWindow.width, aWindow.height);
|
||||||
|
|
||||||
mWindow.window = (void*)mPluginWindowHWND;
|
mWindow.window = (void*)mPluginWindowHWND;
|
||||||
|
mWindow.x = aWindow.x;
|
||||||
|
mWindow.y = aWindow.y;
|
||||||
mWindow.width = aWindow.width;
|
mWindow.width = aWindow.width;
|
||||||
mWindow.height = aWindow.height;
|
mWindow.height = aWindow.height;
|
||||||
mWindow.type = NPWindowTypeWindow;
|
mWindow.type = NPWindowTypeWindow;
|
||||||
|
|
|
@ -375,7 +375,6 @@ PluginInstanceParent::NPP_HandleEvent(void* event)
|
||||||
if (!CallNPP_HandleEvent(*npevent, &handled)) {
|
if (!CallNPP_HandleEvent(*npevent, &handled)) {
|
||||||
return 0; // no good way to handle errors here...
|
return 0; // no good way to handle errors here...
|
||||||
}
|
}
|
||||||
|
|
||||||
return handled;
|
return handled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче