From 264bdab8a86f5fb18d5fcbb39bcea854945fffce Mon Sep 17 00:00:00 2001 From: "peterl@netscape.com" Date: Fri, 3 Sep 1999 23:33:06 +0000 Subject: [PATCH] tracking to UI & forms proposal changes --- layout/base/nsStyleConsts.h | 44 +++++++++++++++------------- layout/base/public/nsIStyleContext.h | 7 ++--- layout/base/public/nsStyleConsts.h | 44 +++++++++++++++------------- 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h index 8f3d612b5d2d..031142dbb16d 100644 --- a/layout/base/nsStyleConsts.h +++ b/layout/base/nsStyleConsts.h @@ -42,16 +42,6 @@ #define NS_SIDE_LEFT 3 -// auto-select -#define NS_STYLE_AUTO_SELECT_NONE 0 -#define NS_STYLE_AUTO_SELECT_SELECT 1 - -// auto-tab -#define NS_STYLE_AUTO_TAB_NONE 0 -#define NS_STYLE_AUTO_TAB_ACTIVATE_NEXT 1 -#define NS_STYLE_AUTO_TAB_SELECT_NEXT 2 -#define NS_STYLE_AUTO_TAB_AUTO 3 - // box-sizing #define NS_STYLE_BOX_SIZING_CONTENT 0 #define NS_STYLE_BOX_SIZING_PADDING 1 @@ -66,12 +56,6 @@ // key-equivalent #define NS_STYLE_KEY_EQUIVALENT_NONE 0 -// modify-content -#define NS_STYLE_MODIFY_CONTENT_READ_ONLY 0 -#define NS_STYLE_MODIFY_CONTENT_READ_WRITE 1 -#define NS_STYLE_MODIFY_CONTENT_WRITE_ONLY 2 -#define NS_STYLE_MODIFY_CONTENT_TOGGLE 3 - // resizer #define NS_STYLE_RESIZER_NONE 0x00 #define NS_STYLE_RESIZER_HORIZONTAL 0x01 // bits @@ -79,11 +63,21 @@ #define NS_STYLE_RESIZER_BOTH 0x03 // bits #define NS_STYLE_RESIZER_AUTO 0x04 // bits -// selection-style -#define NS_STYLE_SELECTION_STYLE_NONE 0 -#define NS_STYLE_SELECTION_STYLE_ANY 1 -#define NS_STYLE_SELECTION_STYLE_LINE 2 -#define NS_STYLE_SELECTION_STYLE_ALL 3 +// user-focus +#define NS_STYLE_USER_FOCUS_NONE 0 +#define NS_STYLE_USER_FOCUS_NORMAL 1 +#define NS_STYLE_USER_FOCUS_SELECT_ALL 2 +#define NS_STYLE_USER_FOCUS_SELECT_BEFORE 3 +#define NS_STYLE_USER_FOCUS_SELECT_AFTER 4 +#define NS_STYLE_USER_FOCUS_SELECT_SAME 5 +#define NS_STYLE_USER_FOCUS_SELECT_MENU 6 + +// user-select +#define NS_STYLE_USER_SELECT_NONE 0 +#define NS_STYLE_USER_SELECT_TEXT 1 +#define NS_STYLE_USER_SELECT_ELEMENT 2 +#define NS_STYLE_USER_SELECT_ELEMENTS 3 +#define NS_STYLE_USER_SELECT_ALL 4 // user-input #define NS_STYLE_USER_INPUT_NONE 0 @@ -91,6 +85,14 @@ #define NS_STYLE_USER_INPUT_DISABLED 2 #define NS_STYLE_USER_INPUT_AUTO 3 +// user-modify +#define NS_STYLE_USER_MODIFY_READ_ONLY 0 +#define NS_STYLE_USER_MODIFY_READ_WRITE 1 +#define NS_STYLE_USER_MODIFY_WRITE_ONLY 2 +#define NS_STYLE_USER_MODIFY_TOGGLE 3 +#define NS_STYLE_USER_MODIFY_TRI_STATE 4 + + // Azimuth - See nsStyleAural #define NS_STYLE_AZIMUTH_LEFT_SIDE 0x00 diff --git a/layout/base/public/nsIStyleContext.h b/layout/base/public/nsIStyleContext.h index 3c10ba570f80..d8d555ad4505 100644 --- a/layout/base/public/nsIStyleContext.h +++ b/layout/base/public/nsIStyleContext.h @@ -285,11 +285,10 @@ protected: struct nsStyleUserInterface: public nsStyleStruct { PRUint8 mUserInput; // [inherited] - PRUint8 mModifyContent; // [inherited] - PRUint8 mSelectionStyle; // [reset] - PRUint8 mAutoSelect; // [inherited] + PRUint8 mUserModify; // [inherited] (modify-content) + PRUint8 mUserSelect; // [reset] (selection-style) + PRUint8 mUserFocus; // [inherited] (auto-select) PRUnichar mKeyEquivalent; // [reset] XXX what type should this be? - PRUint8 mAutoTab; // [inherited] PRUint8 mResizer; // [reset] protected: nsStyleUserInterface(void); diff --git a/layout/base/public/nsStyleConsts.h b/layout/base/public/nsStyleConsts.h index 8f3d612b5d2d..031142dbb16d 100644 --- a/layout/base/public/nsStyleConsts.h +++ b/layout/base/public/nsStyleConsts.h @@ -42,16 +42,6 @@ #define NS_SIDE_LEFT 3 -// auto-select -#define NS_STYLE_AUTO_SELECT_NONE 0 -#define NS_STYLE_AUTO_SELECT_SELECT 1 - -// auto-tab -#define NS_STYLE_AUTO_TAB_NONE 0 -#define NS_STYLE_AUTO_TAB_ACTIVATE_NEXT 1 -#define NS_STYLE_AUTO_TAB_SELECT_NEXT 2 -#define NS_STYLE_AUTO_TAB_AUTO 3 - // box-sizing #define NS_STYLE_BOX_SIZING_CONTENT 0 #define NS_STYLE_BOX_SIZING_PADDING 1 @@ -66,12 +56,6 @@ // key-equivalent #define NS_STYLE_KEY_EQUIVALENT_NONE 0 -// modify-content -#define NS_STYLE_MODIFY_CONTENT_READ_ONLY 0 -#define NS_STYLE_MODIFY_CONTENT_READ_WRITE 1 -#define NS_STYLE_MODIFY_CONTENT_WRITE_ONLY 2 -#define NS_STYLE_MODIFY_CONTENT_TOGGLE 3 - // resizer #define NS_STYLE_RESIZER_NONE 0x00 #define NS_STYLE_RESIZER_HORIZONTAL 0x01 // bits @@ -79,11 +63,21 @@ #define NS_STYLE_RESIZER_BOTH 0x03 // bits #define NS_STYLE_RESIZER_AUTO 0x04 // bits -// selection-style -#define NS_STYLE_SELECTION_STYLE_NONE 0 -#define NS_STYLE_SELECTION_STYLE_ANY 1 -#define NS_STYLE_SELECTION_STYLE_LINE 2 -#define NS_STYLE_SELECTION_STYLE_ALL 3 +// user-focus +#define NS_STYLE_USER_FOCUS_NONE 0 +#define NS_STYLE_USER_FOCUS_NORMAL 1 +#define NS_STYLE_USER_FOCUS_SELECT_ALL 2 +#define NS_STYLE_USER_FOCUS_SELECT_BEFORE 3 +#define NS_STYLE_USER_FOCUS_SELECT_AFTER 4 +#define NS_STYLE_USER_FOCUS_SELECT_SAME 5 +#define NS_STYLE_USER_FOCUS_SELECT_MENU 6 + +// user-select +#define NS_STYLE_USER_SELECT_NONE 0 +#define NS_STYLE_USER_SELECT_TEXT 1 +#define NS_STYLE_USER_SELECT_ELEMENT 2 +#define NS_STYLE_USER_SELECT_ELEMENTS 3 +#define NS_STYLE_USER_SELECT_ALL 4 // user-input #define NS_STYLE_USER_INPUT_NONE 0 @@ -91,6 +85,14 @@ #define NS_STYLE_USER_INPUT_DISABLED 2 #define NS_STYLE_USER_INPUT_AUTO 3 +// user-modify +#define NS_STYLE_USER_MODIFY_READ_ONLY 0 +#define NS_STYLE_USER_MODIFY_READ_WRITE 1 +#define NS_STYLE_USER_MODIFY_WRITE_ONLY 2 +#define NS_STYLE_USER_MODIFY_TOGGLE 3 +#define NS_STYLE_USER_MODIFY_TRI_STATE 4 + + // Azimuth - See nsStyleAural #define NS_STYLE_AZIMUTH_LEFT_SIDE 0x00