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

Renamed badly named raise_border to accent_border.

This commit is contained in:
ramiro%netscape.com 1998-10-01 21:00:04 +00:00
Родитель 589c7fe461
Коммит 6be2a9392f
14 изменённых файлов: 53 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
cmd/xfe/XfeWidgets/Xfe/Arrow.c
Просмотреть файл

@ -300,7 +300,7 @@ _XFE_WIDGET_CLASS_RECORD(arrow,Arrow) =
{
XfeInheritLayoutPixmap, /* layout_pixmap */
XfeInheritDrawPixmap, /* draw_pixmap */
XfeInheritDrawRaiseBorder, /* draw_raise_border */
XfeInheritDrawAccentBorder, /* draw_accent_border */
XfeInheritDrawUnderline, /* draw_underline */
XfeInheritArmTimeout, /* arm_timeout */
NULL, /* extension */
@ -433,8 +433,8 @@ PreferredGeometry(Widget w,Dimension *width,Dimension *height)
/* Include the raise_border_thickenss if needed */
if (bp->raise_on_enter)
{
*width += (2 * bp->raise_border_thickness);
*height += (2 * bp->raise_border_thickness);
*width += (2 * bp->accent_border_thickness);
*height += (2 * bp->accent_border_thickness);
}
}
/*----------------------------------------------------------------------*/
@ -485,7 +485,7 @@ DrawComponents(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
_XfeButtonDrawPixmap(w,event,region,clip_rect);
/* Invoke draw_border method */
_XfeButtonDrawRaiseBorder(w,event,region,clip_rect);
_XfeButtonDrawAccentBorder(w,event,region,clip_rect);
/* Draw the arrow */
DrawArrow(w,event,region,clip_rect);

46
cmd/xfe/XfeWidgets/Xfe/Button.c
Просмотреть файл

@ -54,7 +54,7 @@
#define MESSAGE18 "XmNraised can only be set when XmNraiseOnEnter is True."
#define RAISE_OFFSET(bp) \
(bp->raise_on_enter ? bp->raise_border_thickness : 0)
(bp->raise_on_enter ? bp->accent_border_thickness : 0)
#define XY_IN_LABEL(_lp,_x,_y) XfePointInRect(&(_lp)->label_rect,(_x),(_y))
#define XY_IN_PIXMAP(_bp,_x,_y) XfePointInRect(&(_bp)->pixmap_rect,(_x),(_y))
@ -106,7 +106,7 @@ static GC GetLabelGC (Widget);
/*----------------------------------------------------------------------*/
static void LayoutPixmap (Widget);
static void DrawPixmap (Widget,XEvent *,Region,XRectangle *);
static void DrawRaiseBorder (Widget,XEvent *,Region,XRectangle *);
static void DrawAccentBorder (Widget,XEvent *,Region,XRectangle *);
static void DrawUnderline (Widget,XEvent *,Region,XRectangle *);
static void ArmTimeout (XtPointer,XtIntervalId *);
@ -309,11 +309,11 @@ static XtResource resources[] =
(XtPointer) DefaultRaiseBackground
},
{
XmNraiseBorderThickness,
XmCRaiseBorderThickness,
XmNaccentBorderThickness,
XmCAccentBorderThickness,
XmRHorizontalDimension,
sizeof(Dimension),
XtOffsetOf(XfeButtonRec , xfe_button . raise_border_thickness),
XtOffsetOf(XfeButtonRec , xfe_button . accent_border_thickness),
XmRImmediate,
(XtPointer) 1
},
@ -517,9 +517,9 @@ static XmSyntheticResource syn_resources[] =
_XmToHorizontalPixels
},
{
XmNraiseBorderThickness,
XmNaccentBorderThickness,
sizeof(Dimension),
XtOffsetOf(XfeButtonRec , xfe_button . raise_border_thickness),
XtOffsetOf(XfeButtonRec , xfe_button . accent_border_thickness),
_XmFromHorizontalPixels,
_XmToHorizontalPixels
},
@ -662,7 +662,7 @@ _XFE_WIDGET_CLASS_RECORD(button,Button) =
{
LayoutPixmap, /* layout_pixmap */
DrawPixmap, /* draw_pixmap */
DrawRaiseBorder, /* draw_raise_border */
DrawAccentBorder, /* draw_accent_border */
DrawUnderline, /* draw_underline */
ArmTimeout, /* arm_timeout */
NULL, /* extension */
@ -785,8 +785,8 @@ ClassPartInit(WidgetClass wc)
_XfeResolve(cc,sc,xfe_button_class,layout_pixmap,XfeInheritLayoutPixmap);
_XfeResolve(cc,sc,xfe_button_class,draw_pixmap,XfeInheritDrawPixmap);
_XfeResolve(cc,sc,xfe_button_class,draw_raise_border,
XfeInheritDrawRaiseBorder);
_XfeResolve(cc,sc,xfe_button_class,draw_accent_border,
XfeInheritDrawAccentBorder);
_XfeResolve(cc,sc,xfe_button_class,draw_underline,
XfeInheritDrawUnderline);
@ -930,8 +930,8 @@ SetValues(Widget ow,Widget rw,Widget nw,ArgList args,Cardinal *nargs)
}
}
/* raise_border_thickness */
if (np->raise_border_thickness != op->raise_border_thickness)
/* accent_border_thickness */
if (np->accent_border_thickness != op->accent_border_thickness)
{
_XfeConfigFlags(nw) |= XfeConfigGLE;
}
@ -1217,8 +1217,8 @@ PreferredGeometry(Widget w,Dimension *width,Dimension *height)
/* Include the raise_border_thickenss if needed */
if (bp->raise_on_enter)
{
*width += (2 * bp->raise_border_thickness);
*height += (2 * bp->raise_border_thickness);
*width += (2 * bp->accent_border_thickness);
*height += (2 * bp->accent_border_thickness);
}
switch(bp->button_layout)
@ -1359,8 +1359,8 @@ DrawComponents(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
/* Invoke draw_pixmap method */
_XfeButtonDrawPixmap(w,event,region,clip_rect);
/* Invoke draw_raise_border method */
_XfeButtonDrawRaiseBorder(w,event,region,clip_rect);
/* Invoke draw_accent_border method */
_XfeButtonDrawAccentBorder(w,event,region,clip_rect);
/* Invoke draw_underline method */
_XfeButtonDrawUnderline(w,event,region,clip_rect);
@ -1705,12 +1705,12 @@ DrawPixmap(Widget w,XEvent * event,Region region,XRectangle * clip_rect)
}
/*----------------------------------------------------------------------*/
static void
DrawRaiseBorder(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
DrawAccentBorder(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
{
XfeButtonPart * bp = _XfeButtonPart(w);
/* Make sure the thickness of the raise border ain't 0 */
if (bp->raise_border_thickness == 0)
if (bp->accent_border_thickness == 0)
{
return;
}
@ -1740,7 +1740,7 @@ DrawRaiseBorder(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
_XfeHeight(w) - 2 * _XfeHighlightThickness(w),
bp->raise_border_thickness);
bp->accent_border_thickness);
}
else
{
@ -1758,7 +1758,7 @@ DrawRaiseBorder(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
_XfeHeight(w) - 2 * _XfeHighlightThickness(w),
bp->raise_border_thickness);
bp->accent_border_thickness);
}
}
/*----------------------------------------------------------------------*/
@ -2244,16 +2244,16 @@ _XfeButtonDrawPixmap(Widget w,
}
/*----------------------------------------------------------------------*/
/* extern */ void
_XfeButtonDrawRaiseBorder(Widget w,
_XfeButtonDrawAccentBorder(Widget w,
XEvent * event,
Region region,
XRectangle * clip_rect)
{
XfeButtonWidgetClass bc = (XfeButtonWidgetClass) XtClass(w);
if (bc->xfe_button_class.draw_raise_border)
if (bc->xfe_button_class.draw_accent_border)
{
(*bc->xfe_button_class.draw_raise_border)(w,event,region,clip_rect);
(*bc->xfe_button_class.draw_accent_border)(w,event,region,clip_rect);
}
}
/*----------------------------------------------------------------------*/

8
cmd/xfe/XfeWidgets/Xfe/Button.h
Просмотреть файл

@ -39,6 +39,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmNbutton3DownCallback "button3DownCallback"
#define XmNbutton3UpCallback "button3UpCallback"
#define XmNaccentBorderThickness "accentBorderThickness"
#define XmNarmBackground "armBackground"
#define XmNarmForeground "armForeground"
#define XmNarmOffset "armOffset"
@ -54,7 +55,6 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmNinsensitivePixmapMask "insensitivePixmapMask"
#define XmNpixmapMask "pixmapMask"
#define XmNraiseBackground "raiseBackground"
#define XmNraiseBorderThickness "raiseBorderThickness"
#define XmNraiseForeground "raiseForeground"
#define XmNraiseOffset "raiseOffset"
#define XmNraiseOnEnter "raiseOnEnter"
@ -63,6 +63,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmNraisedPixmapMask "raisedPixmapMask"
#define XmNtransparentCursor "transparentCursor"
#define XmCAccentBorderThickness "AccentBorderThickness"
#define XmCArmBackground "ArmBackground"
#define XmCArmForeground "ArmForeground"
#define XmCArmOffset "ArmOffset"
@ -80,13 +81,12 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmCPixmapMask "PixmapMask"
#define XmCRaiseBackground "RaiseBackground"
#define XmCRaiseForeground "RaiseForeground"
#define XmCRaiseOnEnter "RaiseOnEnter"
#define XmCRaised "Raised"
#define XmCRaisedPixmap "RaisedPixmap"
#define XmCRaisedPixmapMask "RaisedPixmapMask"
#define XmCUnderlineThickness "UnderlineThickness"
#define XmCRaiseBorderThickness "RaiseBorderThickness"
#define XmCRaiseOnEnter "RaiseOnEnter"
#define XmCRaised "Raised"
#define XmRButtonLayout "ButtonLayout"
#define XmRButtonTrigger "ButtonTrigger"

8
cmd/xfe/XfeWidgets/Xfe/ButtonP.h
Просмотреть файл

@ -39,7 +39,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutPixmap ((XtWidgetProc) _XtInherit)
#define XfeInheritDrawPixmap ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawRaiseBorder ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawAccentBorder ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawUnderline ((XfeExposeProc) _XtInherit)
#define XfeInheritArmTimeout ((XtTimerCallbackProc) _XtInherit)
@ -52,7 +52,7 @@ typedef struct
{
XtWidgetProc layout_pixmap; /* layout_pixmap */
XfeExposeProc draw_pixmap; /* draw_pixmap */
XfeExposeProc draw_raise_border; /* draw_raise_border */
XfeExposeProc draw_accent_border; /* draw_raise_border */
XfeExposeProc draw_underline; /* draw_underline */
XtTimerCallbackProc arm_timeout; /* arm_timeout */
XtPointer extension; /* Extension */
@ -110,7 +110,7 @@ typedef struct _XfeButtonPart
Boolean fill_on_enter; /* Fill on enter ? */
Pixel raise_foreground; /* Raise foreground */
Pixel raise_background; /* Raise background */
Dimension raise_border_thickness; /* Raise border thickness*/
Dimension accent_border_thickness; /* Raise border thickness*/
Boolean raise_on_enter; /* Raise on enter ? */
Boolean raised; /* Raised ? */
Boolean determinate; /* Determinate ? */
@ -181,7 +181,7 @@ _XfeButtonDrawPixmap (Widget w,
XRectangle * clip_rect);
/*----------------------------------------------------------------------*/
extern void
_XfeButtonDrawRaiseBorder (Widget w,
_XfeButtonDrawAccentBorder (Widget w,
XEvent * event,
Region region,
XRectangle * clip_rect);

6
cmd/xfe/XfeWidgets/Xfe/Cascade.c
Просмотреть файл

@ -419,7 +419,7 @@ _XFE_WIDGET_CLASS_RECORD(cascade,Cascade) =
{
XfeInheritLayoutPixmap, /* layout_pixmap */
XfeInheritDrawPixmap, /* draw_pixmap */
XfeInheritDrawRaiseBorder, /* draw_raise_border */
XfeInheritDrawAccentBorder, /* draw_accent_border */
XfeInheritDrawUnderline, /* draw_underline */
XfeInheritArmTimeout, /* arm_timeout */
NULL, /* extension */
@ -709,7 +709,7 @@ DrawComponents(Widget w,XEvent *event,Region region,XRectangle * clip_rect)
_XfeButtonDrawPixmap(w,event,region,clip_rect);
/* Invoke draw_border method */
_XfeButtonDrawRaiseBorder(w,event,region,clip_rect);
_XfeButtonDrawAccentBorder(w,event,region,clip_rect);
/* Invoke draw_underline method */
_XfeButtonDrawUnderline(w,event,region,clip_rect);
@ -905,7 +905,7 @@ GetPostPosition(Widget w,Position * x_out,Position * y_out)
if (bp->raise_on_enter)
{
deco_offset += bp->raise_border_thickness;
deco_offset += bp->accent_border_thickness;
}
switch(cp->sub_menu_alignment)

2
cmd/xfe/XfeWidgets/Xfe/FontChooser.c
Просмотреть файл

@ -218,7 +218,7 @@ _XFE_WIDGET_CLASS_RECORD(fontchooser,FontChooser) =
{
XfeInheritLayoutPixmap, /* layout_pixmap */
XfeInheritDrawPixmap, /* draw_pixmap */
XfeInheritDrawRaiseBorder, /* draw_raise_border */
XfeInheritDrawAccentBorder, /* draw_accent_border */
XfeInheritArmTimeout, /* arm_timeout */
NULL, /* extension */
},

2
cmd/xfe/XfeWidgets/Xfe/Logo.c
Просмотреть файл

@ -245,7 +245,7 @@ _XFE_WIDGET_CLASS_RECORD(logo,Logo) =
{
XfeInheritLayoutPixmap, /* layout_pixmap */
DrawPixmap, /* draw_pixmap */
XfeInheritDrawRaiseBorder, /* draw_raise_border */
XfeInheritDrawAccentBorder, /* draw_accent_border */
XfeInheritDrawUnderline, /* draw_underline */
XfeInheritArmTimeout, /* arm_timeout */
NULL, /* extension */

2
cmd/xfe/XfeWidgets/XfeCaption/Caption.c
Просмотреть файл

@ -647,7 +647,7 @@ TitleCreate(Widget w)
XtSetArg(av[ac],XmNshadowThickness, 0); ac++;
XtSetArg(av[ac],XmNstringDirection, pp->title_direction); ac++;
XtSetArg(av[ac],XmNraiseBorderThickness, 0); ac++;
XtSetArg(av[ac],XmNaccentBorderThickness, 0); ac++;
XtSetArg(av[ac],XmNraiseOnEnter, False); ac++;
XtSetArg(av[ac],XmNfillOnArm, False); ac++;
XtSetArg(av[ac],XmNarmOffset, 0); ac++;

2
cmd/xfe/XfeWidgets/XfeComboBox/ComboBox.c
Просмотреть файл

@ -1381,7 +1381,7 @@ ArrowCreate(Widget w)
XmNbackgroundPixmap, _XfeBackgroundPixmap(w),
XmNshadowThickness, 1,
/* XmNemulateMotif, False, */
XmNraiseBorderThickness, 0,
XmNaccentBorderThickness, 0,
XmNraiseOnEnter, False,
XmNfillOnEnter, False,
XmNshadowThickness, 0,

10
cmd/xfe/XfeWidgets/XfeToolBar/Tab.c
Просмотреть файл

@ -191,13 +191,13 @@ static XtResource resources[] =
(XtPointer) XmVERTICAL
},
/* Force XmNraiseBorderThickness to 0 */
/* Force XmNaccentBorderThickness to 0 */
{
XmNraiseBorderThickness,
XmCRaiseBorderThickness,
XmNaccentBorderThickness,
XmCAccentBorderThickness,
XmRHorizontalDimension,
sizeof(Dimension),
XtOffsetOf(XfeTabRec , xfe_button . raise_border_thickness),
XtOffsetOf(XfeTabRec , xfe_button . accent_border_thickness),
XmRImmediate,
(XtPointer) 0
},
@ -317,7 +317,7 @@ _XFE_WIDGET_CLASS_RECORD(tab,Tab) =
{
XfeInheritLayoutPixmap, /* layout_pixmap */
XfeInheritDrawPixmap, /* draw_pixmap */
XfeInheritDrawRaiseBorder, /* draw_raise_border */
XfeInheritDrawAccentBorder, /* draw_accent_border */
XfeInheritDrawUnderline, /* draw_underline */
XfeInheritArmTimeout, /* arm_timeout */
NULL, /* extension */

2
cmd/xfe/XfeWidgets/XfeToolBar/ToolBar.h
Просмотреть файл

@ -50,6 +50,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmNmaxNumColumns "maxNumColumns"
#define XmNmaxNumRows "maxNumRows"
#define XmNnumRows "numRows"
#define XmNraiseBorderThickness "raiseBorderThickness"
#define XmNselectedButton "selectedButton"
#define XmNseparatorThickness "separatorThickness"
#define XmNtoggleBehavior "toggleBehavior"
@ -64,6 +65,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmCMaxNumColumns "MaxNumColumns"
#define XmCMaxNumRows "MaxNumRows"
#define XmCNumRows "NumRows"
#define XmCRaiseBorderThickness "RaiseBorderThickness"
#define XmCSelectedButton "SelectedButton"
#define XmCSeparatorThickness "SeparatorThickness"
#define XmCToggleBehavior "ToggleBehavior"

3
cmd/xfe/XfeWidgets/XfeToolBar/ToolBarP.h
Просмотреть файл

@ -38,10 +38,7 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutIndicator ((XtWidgetProc) _XtInherit)
#ifndef XfeInheritDrawRaiseBorder
#define XfeInheritDrawRaiseBorder ((XfeExposeProc) _XtInherit)
#endif
/*----------------------------------------------------------------------*/
/* */

2
cmd/xfe/XfeWidgets/XfeToolTip/ToolTipShell.c
Просмотреть файл

@ -410,7 +410,7 @@ LabelCreate(Widget w)
/* XtSetArg(av[ac],XmNshadowThickness, 0); ac++; */
/* XtSetArg(av[ac],XmNstringDirection, tp->title_direction); ac++; */
XtSetArg(av[ac],XmNraiseBorderThickness, 0); ac++;
XtSetArg(av[ac],XmNaccentBorderThickness, 0); ac++;
XtSetArg(av[ac],XmNraiseOnEnter, False); ac++;
XtSetArg(av[ac],XmNfillOnArm, False); ac++;
XtSetArg(av[ac],XmNarmOffset, 0); ac++;

6
cmd/xfe/resources
Просмотреть файл

@ -5329,7 +5329,7 @@ Drag this to create a link to this page
*urlLocationProxyIcon.cursor: hand2
*urlLocationProxyIcon.shadowThickness: 0
*urlLocationProxyIcon.raiseBorderThickness: 0
*urlLocationProxyIcon.accentBorderThickness: 0
*urlLocationProxyIcon.fillOnArm: false
*urlLocationProxyIcon.buttonLayout: button_pixmap_only
@ -5383,7 +5383,7 @@ Drag this to create a link to this page
*toolBoxItem*XfeToolBar.marginBottom: 0
*toolBoxItem*XfeToolBar.spacing: 1
*toolBoxItem*XfeToolBar.raiseBorderThickness: 2
*toolBoxItem*XfeToolBar.accentBorderThickness: 2
*toolBoxItem*XfeToolBar.indicatorThreshold: 10
*toolBoxItem*XfeToolBar*XfeButton.marginBottom: 1
@ -6625,7 +6625,7 @@ for download.
*taskBarUndockButton.armOffset: 0
*taskBarUndockButton.raiseOffset: 0
*taskBarUndockButton.fillOnEnter: true
*taskBarUndockButton.raiseBorderThickness: 0
*taskBarUndockButton.accentBorderThickness: 0
*taskBarUndockButton.raiseOnEnter: false
*taskBarUndockButton.fillOnArm: true
*taskBarUndockButton.shadowThickness: 1