Kaydet (Commit) 68deef11 authored tarafından Tsutomu Uchino's avatar Tsutomu Uchino Kaydeden (comit) Caolán McNamara

Resolves: #i67663# add vertical alighment on property UI

(cherry picked from commit 2b2128d0)

Conflicts:
	extensions/source/propctrlr/formmetadata.cxx

Change-Id: Ic6d708454009e8023dc2e601043409377fd6cb34
üst 793b2b86
......@@ -125,6 +125,7 @@
#define HID_PROP_LINECOLOR "EXTENSIONS_HID_PROP_LINECOLOR"
#define HID_PROP_BORDER "EXTENSIONS_HID_PROP_BORDER"
#define HID_PROP_ALIGN "EXTENSIONS_HID_PROP_ALIGN"
#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN"
#define HID_PROP_DROPDOWN "EXTENSIONS_HID_PROP_DROPDOWN"
#define HID_PROP_MULTILINE "EXTENSIONS_HID_PROP_MULTILINE"
#define HID_PROP_HSCROLL "EXTENSIONS_HID_PROP_HSCROLL"
......
......@@ -281,7 +281,7 @@ namespace pcr
DEF_INFO_3( FONT, FONT, 142, FONT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_4( VISUALEFFECT, VISUALEFFECT, 143, VISUALEFFECT, FORM_VISIBLE, DIALOG_VISIBLE, ENUM_ONE, COMPOSEABLE ),
DEF_INFO_4( ALIGN, ALIGN, 144, ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
DEF_INFO_3( VERTICAL_ALIGN, VERTICAL_ALIGN, 145, VERTICAL_ALIGN, FORM_VISIBLE, ENUM, COMPOSEABLE ),
DEF_INFO_4( VERTICAL_ALIGN, VERTICAL_ALIGN, 145, VERTICAL_ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
DEF_INFO_3( ROWHEIGHT, ROWHEIGHT, 146, ROWHEIGHT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( BACKGROUNDCOLOR, BACKGROUNDCOLOR, 147, BACKGROUNDCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( SYMBOLCOLOR, SYMBOLCOLOR, 148, SYMBOLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment