зеркало из https://github.com/mozilla/pjs.git
Changes for qnx/photon platform. They should not affect building/runtime other platforms.
When printing from the embedded application, allow it to set the print frame, BG colors, BG images in the print settings, according to the preferences. Also changes for ShowTooltip ( it was broken ). Known problem - the location is broken if the page has frames and the tooltip is inside a frame.
This commit is contained in:
Родитель
1d16395b95
Коммит
c0c8d854a3
|
@ -25,7 +25,7 @@ VPATH = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
DIRS=src
|
DIRS=src mozserver
|
||||||
|
|
||||||
ifdef ENABLE_TESTS
|
ifdef ENABLE_TESTS
|
||||||
DIRS += tests
|
DIRS += tests
|
||||||
|
|
|
@ -962,6 +962,10 @@ static void mozilla_set_default_pref( nsIPref *pref )
|
||||||
pref->SetCharPref( "network.proxy.ftp_port", "80" );
|
pref->SetCharPref( "network.proxy.ftp_port", "80" );
|
||||||
pref->SetCharPref( "network.proxy.gopher_port", "80" );
|
pref->SetCharPref( "network.proxy.gopher_port", "80" );
|
||||||
|
|
||||||
|
pref->SetCharPref( "general.skins.selectedSkin", "classic/1.0" );
|
||||||
|
pref->SetIntPref( "browser.cache.memory.capacity", 100 ); /* 100k ( no cache ) */
|
||||||
|
pref->SetCharPref( "user.print.print_frame", "print_frame_selected" );
|
||||||
|
|
||||||
pref->SavePrefFile( nsnull );
|
pref->SavePrefFile( nsnull );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -490,12 +490,12 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
|
||||||
const PRUnichar *aTipText)
|
const PRUnichar *aTipText)
|
||||||
{
|
{
|
||||||
nsAutoString tipText ( aTipText );
|
nsAutoString tipText ( aTipText );
|
||||||
const char* tipString = ToNewCString(tipText);
|
const char* tipString = ToNewCString(tipText), *font = "TextFont08";
|
||||||
PtArg_t args[10];
|
PtArg_t args[10];
|
||||||
PhRect_t extent;
|
PhRect_t extent;
|
||||||
PhDim_t dim;
|
PhDim_t dim;
|
||||||
PhPoint_t pos = {0, 0};
|
PhPoint_t pos = {0, 0};
|
||||||
int n = 0;
|
int n = 0, w, h;
|
||||||
|
|
||||||
if (sTipWindow)
|
if (sTipWindow)
|
||||||
PtDestroyWidget(sTipWindow);
|
PtDestroyWidget(sTipWindow);
|
||||||
|
@ -506,22 +506,27 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
|
||||||
PtWidget_t *window;
|
PtWidget_t *window;
|
||||||
window = NS_STATIC_CAST(PtWidget_t *, mainWidget->GetNativeData(NS_NATIVE_WINDOW));
|
window = NS_STATIC_CAST(PtWidget_t *, mainWidget->GetNativeData(NS_NATIVE_WINDOW));
|
||||||
|
|
||||||
PgExtentText(&extent, &pos, NULL, tipString, 0);
|
PgExtentText(&extent, &pos, font, tipString, 0);
|
||||||
dim.w = extent.lr.x - extent.ul.x + 1;
|
w = extent.lr.x - extent.ul.x + 1;
|
||||||
dim.h = extent.lr.y - extent.ul.y + 1;
|
h = extent.lr.y - extent.ul.y + 1;
|
||||||
|
|
||||||
pos.x = aXCoords;
|
|
||||||
pos.y = aYCoords;
|
|
||||||
n = 0;
|
n = 0;
|
||||||
|
pos.x = aXCoords;
|
||||||
|
pos.y = aYCoords + 10; /* we add 10 so that we don't position it right under the mouse */
|
||||||
|
dim.w = w + 6; dim.h = h + 6;
|
||||||
PtSetArg(&args[n++], Pt_ARG_POS, &pos, 0);
|
PtSetArg(&args[n++], Pt_ARG_POS, &pos, 0);
|
||||||
PtSetArg(&args[n++], Pt_ARG_DIM, &dim, 0);
|
PtSetArg(&args[n++], Pt_ARG_DIM, &dim, 0);
|
||||||
|
PtSetArg( &args[n++], Pt_ARG_REGION_OPAQUE, Ph_EV_EXPOSE, Ph_EV_EXPOSE);
|
||||||
sTipWindow = PtCreateWidget(PtRegion, window, n, args);
|
sTipWindow = PtCreateWidget(PtRegion, window, n, args);
|
||||||
|
|
||||||
n = 0;
|
n = 0;
|
||||||
pos.x = pos.y = 0;
|
pos.x = pos.y = 0;
|
||||||
|
dim.w = w; dim.h = h;
|
||||||
PtSetArg(&args[n++], Pt_ARG_POS, &pos, 0);
|
PtSetArg(&args[n++], Pt_ARG_POS, &pos, 0);
|
||||||
PtSetArg(&args[n++], Pt_ARG_DIM, &dim, 0);
|
PtSetArg(&args[n++], Pt_ARG_DIM, &dim, 0);
|
||||||
PtSetArg(&args[n++], Pt_ARG_FLAGS, Pt_HIGHLIGHTED, -1 );
|
PtSetArg(&args[n++], Pt_ARG_FLAGS, Pt_HIGHLIGHTED, -1 );
|
||||||
PtSetArg(&args[n++], Pt_ARG_FILL_COLOR, 0xfeffb1, 0);
|
PtSetArg(&args[n++], Pt_ARG_FILL_COLOR, 0xfeffb1, 0);
|
||||||
|
PtSetArg(&args[n++], Pt_ARG_TEXT_FONT, font, 0);
|
||||||
PtSetArg(&args[n++], Pt_ARG_TEXT_STRING, tipString, 0);
|
PtSetArg(&args[n++], Pt_ARG_TEXT_STRING, tipString, 0);
|
||||||
PtSetArg(&args[n++], Pt_ARG_BASIC_FLAGS, Pt_STATIC_GRADIENT | Pt_TOP_OUTLINE | Pt_LEFT_OUTLINE |
|
PtSetArg(&args[n++], Pt_ARG_BASIC_FLAGS, Pt_STATIC_GRADIENT | Pt_TOP_OUTLINE | Pt_LEFT_OUTLINE |
|
||||||
Pt_RIGHT_OUTLINE | Pt_BOTTOM_OUTLINE, -1 );
|
Pt_RIGHT_OUTLINE | Pt_BOTTOM_OUTLINE, -1 );
|
||||||
|
|
|
@ -733,6 +733,13 @@ mozilla_set_pref( PtWidget_t *widget, char *option, char *value )
|
||||||
else if( !strcmp( option, "Use_Explicit_Accept_Headers" ) ) ; /* not used */
|
else if( !strcmp( option, "Use_Explicit_Accept_Headers" ) ) ; /* not used */
|
||||||
else if( !strcmp( option, "Visitation_Horizon" ) ) ; /* not used */
|
else if( !strcmp( option, "Visitation_Horizon" ) ) ; /* not used */
|
||||||
|
|
||||||
|
else if( !strcmp( option, "Print_Frame" ) )
|
||||||
|
pref->SetCharPref( "user.print.print_frame", value );
|
||||||
|
else if( !strcmp( option, "SetPrintBGColors" ) )
|
||||||
|
pref->SetCharPref( "user.print.SetPrintBGColors", value );
|
||||||
|
else if( !strcmp( option, "SetPrintBGImages" ) )
|
||||||
|
pref->SetCharPref( "user.print.SetPrintBGImages", value );
|
||||||
|
|
||||||
pref->SavePrefFile( nsnull );
|
pref->SavePrefFile( nsnull );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче