summaryrefslogtreecommitdiff
path: root/apps/NxWidgets
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-14 11:23:20 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-14 11:23:20 -0600
commita2e9dfd19b671e6aded04323b9bc94058cbe8311 (patch)
tree7265e2f0fc9549b50e9fb9cd1d81c883a730991e /apps/NxWidgets
parent95240a795802290d01ea5a628f78cab62ea01fb2 (diff)
downloadnuttx-a2e9dfd19b671e6aded04323b9bc94058cbe8311.tar.gz
nuttx-a2e9dfd19b671e6aded04323b9bc94058cbe8311.tar.bz2
nuttx-a2e9dfd19b671e6aded04323b9bc94058cbe8311.zip
NxWM: Toolbar font ID can now be separately configured
Diffstat (limited to 'apps/NxWidgets')
-rw-r--r--apps/NxWidgets/Kconfig31
1 files changed, 26 insertions, 5 deletions
diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index f8d66b1cb..2f91b0308 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -494,7 +494,8 @@ if NXWM_CUSTOM_TASKBAR_WIDTH
config NXWM_TASKBAR_WIDTH
int "Taskbar Width"
- default 29
+ default 29 if !NXWM_LARGE_ICONS
+ default 54 if !NXWM_LARGE_ICONS
---help---
Task bar thickness (either vertical or horizontal). Default: 25 + 2*2
@@ -546,18 +547,38 @@ config NXWM_CUSTOM_TOOLBAR_HEIGHT
---help---
Set to override the default tooldar height The default depends on
the selected horizontal or vertical spacing. Default: 21 + 2*spacing
+ or 42 + 2*spacing if large icons are selected
if NXWM_CUSTOM_TOOLBAR_HEIGHT
config NXWM_TOOLBAR_HEIGHT
int "Toolbar Height"
- default 25
+ default 25 if !NXWM_LARGE_ICONS
+ default 46 if NXWM_LARGE_ICONS
---help---
The height of the tool bar in each application window. At present,
all icons are 21 pixels in height and, hence, require a task bar of
- at least that size. Default: 21 + 2*2
+ at least that size. Default: 21 + 2*2or 42 + 2*spacing if large
+ icons are selected
endif # NXWM_CUSTOM_TOOLBAR_HEIGHT
+
+config NXWM_TOOLBAR_CUSTOM_FONTID
+ bool "Use Custom Toolbar Font"
+ default n
+ ---help---
+ Set to override the NxWM default font id (NXWM_DEFAULT_FONTID).
+
+if NXWM_TOOLBAR_CUSTOM_FONTID
+
+config NXWM_TOOLBAR_FONTID
+ int "Toolbar Font ID"
+ default 0
+ ---help---
+ Use this default font ID in the NxConsole window instead of the
+ NxWM font ID (NXWM_DEFAULT_FONTID). Default: 0 (maybe invalid)
+
+endif # NXWM_TOOLBAR_CUSTOM_FONTID
endmenu # NxWM Toolbar Configuration
menu "NxWM Application Window Configuration"
@@ -709,7 +730,7 @@ config NXWM_NXCONSOLE_CUSTOM_FONTID
bool "Use Custom Default Font"
default n
---help---
- Set to override the system default font id (NXWM_DEFAULT_FONTID).
+ Set to override the NxWM default font id (NXWM_DEFAULT_FONTID).
if NXWM_NXCONSOLE_CUSTOM_FONTID
@@ -1070,7 +1091,7 @@ config NXWM_HEXCALCULATOR_CUSTOM_FONTID
bool "Use Custom Default Font"
default n
---help---
- Set to override the system default font id (NXWM_DEFAULT_FONTID).
+ Set to override the NxWM default font id (NXWM_DEFAULT_FONTID).
if NXWM_HEXCALCULATOR_CUSTOM_FONTID