[SCM] calf/master: bug: white background behind some widgets due to d109ef35 fix: leds, valves, vumeters and curves with sharp corners
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:38 UTC 2013
The following commit has been merged in the master branch:
commit 6f4565add7dba3e161384bdd6aabcd0bda67f727
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Fri Nov 18 04:43:32 2011 +0100
bug: white background behind some widgets due to d109ef35
fix: leds, valves, vumeters and curves with sharp corners
diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index 6ba3e17..89d8f91 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -25,9 +25,9 @@ style "calf-default"
GtkRange ::slider-width = 15
GtkRange ::stepper-size = 15
GtkRange::trough_border = 0
- GtkVScale::slider_length = 46
- GtkVScale::slider_width = 35
- GtkHScale::slider_length = 46
+ GtkVScale::slider_length = 46
+ GtkVScale::slider_width = 35
+ GtkHScale::slider_length = 46
GtkHScale::slider_width = 35
GtkScale ::trough-side-details = 0 # Restores sliders
@@ -93,80 +93,80 @@ style "calf-default"
engine "pixmap"
{
- image
- {
- function = BOX
- detail = "buttondefault"
- recolorable = TRUE
- overlay_file = "button_default.png"
- overlay_border = {8, 8, 2, 2}
- overlay_stretch = FALSE
+ image
+ {
+ function = BOX
+ detail = "buttondefault"
+ recolorable = TRUE
+ overlay_file = "button_default.png"
+ overlay_border = {8, 8, 2, 2}
+ overlay_stretch = FALSE
}
- # Focus
- image
- {
- function = FOCUS
- recolorable = TRUE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
-
+ # Focus
+ image
+ {
+ function = FOCUS
+ recolorable = TRUE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+
# Arrows
- image
- {
- function = ARROW
- state = INSENSITIVE
- recolorable = FALSE
- overlay_file = "led_inactive.png"
- overlay_border = { 3, 3, 2, 2 }
- overlay_stretch = FALSE
- }
- image
- {
- function = ARROW
- recolorable = FALSE
- state = NORMAL
- overlay_file = "led_normal.png"
- overlay_border = { 3, 3, 2, 2 }
- overlay_stretch = FALSE
- }
- image
- {
- function = ARROW
- recolorable = FALSE
- state = ACTIVE
- overlay_file = "led_active.png"
- overlay_border = { 3, 3, 2, 2 }
- overlay_stretch = FALSE
- }
- image
- {
- function = ARROW
- recolorable = FALSE
- state = PRELIGHT
- overlay_file = "led_prelight.png"
- overlay_border = { 3, 3, 2, 2 }
- overlay_stretch = FALSE
+ image
+ {
+ function = ARROW
+ state = INSENSITIVE
+ recolorable = FALSE
+ overlay_file = "led_inactive.png"
+ overlay_border = { 3, 3, 2, 2 }
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = ARROW
+ recolorable = FALSE
+ state = NORMAL
+ overlay_file = "led_normal.png"
+ overlay_border = { 3, 3, 2, 2 }
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = ARROW
+ recolorable = FALSE
+ state = ACTIVE
+ overlay_file = "led_active.png"
+ overlay_border = { 3, 3, 2, 2 }
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = ARROW
+ recolorable = FALSE
+ state = PRELIGHT
+ overlay_file = "led_prelight.png"
+ overlay_border = { 3, 3, 2, 2 }
+ overlay_stretch = FALSE
}
# Lines
- image
- {
- function = VLINE
- recolorable = FALSE
- file = "vline.png"
- border = { 1, 1, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = HLINE
- recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 1, 1 }
- stretch = TRUE
+ image
+ {
+ function = VLINE
+ recolorable = FALSE
+ file = "vline.png"
+ border = { 1, 1, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 1, 1 }
+ stretch = TRUE
}
# Shadows
@@ -261,13 +261,13 @@ style "calf-default"
}
# Clear default box
- image
- {
- function = BOX
- recolorable = TRUE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
+ image
+ {
+ function = BOX
+ recolorable = TRUE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
}
}
}
@@ -329,16 +329,16 @@ style "calf-button"
xthickness = 5
ythickness = 2
- fg[NORMAL] = "#000"
- fg[PRELIGHT] = "#000"
- fg[SELECTED] = "#000"
- fg[ACTIVE] = "#000"
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[SELECTED] = "#000"
+ fg[ACTIVE] = "#000"
fg[INSENSITIVE] = "#666"
- text[NORMAL] = "#000"
- text[PRELIGHT] = "#000"
- text[SELECTED] = "#000"
- text[ACTIVE] = "#000"
+ text[NORMAL] = "#000"
+ text[PRELIGHT] = "#000"
+ text[SELECTED] = "#000"
+ text[ACTIVE] = "#000"
text[INSENSITIVE] = "#666"
bg[NORMAL] = "#DADADA"
@@ -352,51 +352,51 @@ style "calf-button"
base[ACTIVE] = shade (1.4, "#D1D1D1")
base[SELECTED] = "#DADADA"
base[INSENSITIVE] = shade (0.7, "#D1D1D1")
-
- engine "pixmap"
- {
- image
- {
- function = BOX
- detail = "buttondefault"
- recolorable = FALSE
- file = "button_default.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = PRELIGHT
- recolorable = FALSE
- file = "button_default_prelight.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = ACTIVE
- file = "button_default_active.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = INSENSITIVE
- file = "button_default.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- file = "button_default.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
-
+
+ engine "pixmap"
+ {
+ image
+ {
+ function = BOX
+ detail = "buttondefault"
+ recolorable = FALSE
+ file = "button_default.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ recolorable = FALSE
+ file = "button_default_prelight.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ file = "button_default_active.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ file = "button_default.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ file = "button_default.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+
}
}
@@ -412,16 +412,16 @@ style "calf-toggle"
xthickness = 5
ythickness = 2
- fg[NORMAL] = "#000"
- fg[PRELIGHT] = "#000"
- fg[SELECTED] = "#000"
- fg[ACTIVE] = "#000"
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[SELECTED] = "#000"
+ fg[ACTIVE] = "#000"
fg[INSENSITIVE] = "#666"
- text[NORMAL] = "#000"
- text[PRELIGHT] = "#000"
- text[SELECTED] = "#000"
- text[ACTIVE] = "#000"
+ text[NORMAL] = "#000"
+ text[PRELIGHT] = "#000"
+ text[SELECTED] = "#000"
+ text[ACTIVE] = "#000"
text[INSENSITIVE] = "#666"
bg[NORMAL] = "#DADADA"
@@ -435,51 +435,51 @@ style "calf-toggle"
base[ACTIVE] = shade (1.4, "#D1D1D1")
base[SELECTED] = "#DADADA"
base[INSENSITIVE] = shade (0.7, "#D1D1D1")
-
- engine "pixmap"
- {
- image
- {
- function = BOX
- detail = "buttondefault"
- recolorable = FALSE
- file = "button_normal.png"
- border = {6, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = PRELIGHT
- recolorable = FALSE
- file = "button_prelight.png"
- border = {6, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = ACTIVE
- file = "button_active.png"
- border = {6, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = INSENSITIVE
- file = "button_insens.png"
- border = {6, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- file = "button_normal.png"
- border = {6, 24, 6, 6}
- stretch = TRUE
- }
-
+
+ engine "pixmap"
+ {
+ image
+ {
+ function = BOX
+ detail = "buttondefault"
+ recolorable = FALSE
+ file = "button_normal.png"
+ border = {6, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ recolorable = FALSE
+ file = "button_prelight.png"
+ border = {6, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ file = "button_active.png"
+ border = {6, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ file = "button_insens.png"
+ border = {6, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ file = "button_normal.png"
+ border = {6, 24, 6, 6}
+ stretch = TRUE
+ }
+
}
}
@@ -496,16 +496,16 @@ style "calf-button-norm"
xthickness = 5
ythickness = 2
- fg[NORMAL] = "#000"
- fg[PRELIGHT] = "#000"
- fg[SELECTED] = "#000"
- fg[ACTIVE] = "#000"
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[SELECTED] = "#000"
+ fg[ACTIVE] = "#000"
fg[INSENSITIVE] = "#666"
- text[NORMAL] = "#000"
- text[PRELIGHT] = "#000"
- text[SELECTED] = "#000"
- text[ACTIVE] = "#000"
+ text[NORMAL] = "#000"
+ text[PRELIGHT] = "#000"
+ text[SELECTED] = "#000"
+ text[ACTIVE] = "#000"
text[INSENSITIVE] = "#666"
bg[NORMAL] = "#DADADA"
@@ -519,49 +519,49 @@ style "calf-button-norm"
base[ACTIVE] = shade (1.4, "#D1D1D1")
base[SELECTED] = "#DADADA"
base[INSENSITIVE] = shade (0.7, "#D1D1D1")
-
- engine "pixmap"
- {
- image
- {
- function = BOX
- file = "button_default.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
+
+ engine "pixmap"
+ {
+ image
+ {
function = BOX
- state = PRELIGHT
- file = "button_default_prelight.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
+ file = "button_default.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
}
- image
- {
+ image
+ {
function = BOX
- state = ACTIVE
- file = "button_default_active.png"
- border = {6, 6, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = VLINE
- recolorable = FALSE
- file = "vline.png"
- border = { 1, 1, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = HLINE
- recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 1, 1 }
- stretch = TRUE
- }
-
+ state = PRELIGHT
+ file = "button_default_prelight.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ file = "button_default_active.png"
+ border = {6, 6, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = VLINE
+ recolorable = FALSE
+ file = "vline.png"
+ border = { 1, 1, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 1, 1 }
+ stretch = TRUE
+ }
+
}
}
@@ -571,16 +571,16 @@ style "calf-button-norm"
style "calf-combobox"
{
- fg[NORMAL] = "#000"
- fg[PRELIGHT] = "#000"
- fg[SELECTED] = "#000"
- fg[ACTIVE] = "#000"
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[SELECTED] = "#000"
+ fg[ACTIVE] = "#000"
fg[INSENSITIVE] = "#666"
- text[NORMAL] = "#000"
- text[PRELIGHT] = "#000"
- text[SELECTED] = "#000"
- text[ACTIVE] = "#000"
+ text[NORMAL] = "#000"
+ text[PRELIGHT] = "#000"
+ text[SELECTED] = "#000"
+ text[ACTIVE] = "#000"
text[INSENSITIVE] = "#666"
bg[NORMAL] = "#DADADA"
@@ -601,70 +601,70 @@ style "calf-combobox"
GtkButton ::inner-border = { 8, 29, 1, 1}
xthickness = 5
- ythickness = 2
+ ythickness = 2
- engine "pixmap"
- {
- image
- {
- function = BOX
- recolorable = FALSE
- state = PRELIGHT
- file = "button_default_prelight.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- recolorable = FALSE
- state = NORMAL
- file = "button_default.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
- }
-
- image
- {
- function = BOX
- recolorable = FALSE
- state = ACTIVE
- file = "button_default_active.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
- }
- image
- {
- function = BOX
- recolorable = FALSE
- state = INSENSITIVE
- file = "button_default.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
- }
-# image
-# {
-# function = ARROW
-# recolorable = FALSE
-# overlay_file = "null.png"
-# overlay_stretch = FALSE
-# }
- image
- {
- function = VLINE
- recolorable = FALSE
- file = "vline.png"
- border = { 1, 1, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = HLINE
- recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 1, 1 }
- stretch = TRUE
- }
+ engine "pixmap"
+ {
+ image
+ {
+ function = BOX
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "button_default_prelight.png"
+ border = {8, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ recolorable = FALSE
+ state = NORMAL
+ file = "button_default.png"
+ border = {8, 24, 6, 6}
+ stretch = TRUE
+ }
+
+ image
+ {
+ function = BOX
+ recolorable = FALSE
+ state = ACTIVE
+ file = "button_default_active.png"
+ border = {8, 24, 6, 6}
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "button_default.png"
+ border = {8, 24, 6, 6}
+ stretch = TRUE
+ }
+# image
+# {
+# function = ARROW
+# recolorable = FALSE
+# overlay_file = "null.png"
+# overlay_stretch = FALSE
+# }
+ image
+ {
+ function = VLINE
+ recolorable = FALSE
+ file = "vline.png"
+ border = { 1, 1, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 1, 1 }
+ stretch = TRUE
+ }
}
}
@@ -682,43 +682,43 @@ style "calf-comboboxentry" = "calf-combobox"
### TEXT ENTRY ###
-style "calf-entry"
+style "calf-entry"
{
- xthickness = 0
- ythickness = 0
+ xthickness = 0
+ ythickness = 0
GtkEntry::shadow-type = GTK_SHADOW_NONE
GtkEntry::inner-border = { 6, 6, 5, 4 }
base[NORMAL] = "#000"
- engine "pixmap"
- {
- image
- {
- function = SHADOW
- shadow = IN
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "entry_inactive.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
- image
- {
- function = FLAT_BOX
- state = NORMAL
- detail = "entry_bg"
- file = "entry.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
- }
+ engine "pixmap"
+ {
+ image
+ {
+ function = SHADOW
+ shadow = IN
+ recolorable = FALSE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = FLAT_BOX
+ state = INSENSITIVE
+ detail = "entry_bg"
+ file = "entry_inactive.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = FLAT_BOX
+ state = NORMAL
+ detail = "entry_bg"
+ file = "entry.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ }
}
@@ -730,135 +730,135 @@ style "calf-spinbutton" = "calf-entry"
xthickness = 0
ythickness = 0
base[NORMAL] = "#000"
- engine "pixmap"
- {
- image
- {
- function = ARROW
- }
- image
- {
- function = SHADOW
- shadow = IN
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "entry_inactive.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
- image
- {
- function = FLAT_BOX
- state = NORMAL
- detail = "entry_bg"
- file = "entry.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
- image
- {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- recolorable = FALSE
- file = "spin_up_normal.png"
- border = { 6, 4, 4, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- recolorable = FALSE
- file = "spin_up_prelight.png"
- border = { 6, 4, 4, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- recolorable = FALSE
- file = "spin_up_inactive.png"
- border = { 6, 4, 4, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- recolorable = FALSE
- file = "spin_up_active.png"
- border = { 6, 4, 4, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
-
- image
- {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- recolorable = FALSE
- file = "spin_down_normal.png"
- border = { 6, 4, 3, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- recolorable = FALSE
- file = "spin_down_prelight.png"
- border = { 6, 4, 3, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- recolorable = FALSE
- file = "spin_down_inactive.png"
- border = { 6, 4, 3, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
- }
- image
- {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- recolorable = FALSE
- file = "spin_down_active.png"
- border = { 6, 4, 3, 3 }
- stretch = TRUE
- overlay_file = "null.png"
- overlay_stretch = FALSE
+ engine "pixmap"
+ {
+ image
+ {
+ function = ARROW
+ }
+ image
+ {
+ function = SHADOW
+ shadow = IN
+ recolorable = FALSE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = FLAT_BOX
+ state = INSENSITIVE
+ detail = "entry_bg"
+ file = "entry_inactive.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = FLAT_BOX
+ state = NORMAL
+ detail = "entry_bg"
+ file = "entry.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ state = NORMAL
+ detail = "spinbutton_up"
+ recolorable = FALSE
+ file = "spin_up_normal.png"
+ border = { 6, 4, 4, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ detail = "spinbutton_up"
+ recolorable = FALSE
+ file = "spin_up_prelight.png"
+ border = { 6, 4, 4, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ detail = "spinbutton_up"
+ recolorable = FALSE
+ file = "spin_up_inactive.png"
+ border = { 6, 4, 4, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ detail = "spinbutton_up"
+ recolorable = FALSE
+ file = "spin_up_active.png"
+ border = { 6, 4, 4, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+
+ image
+ {
+ function = BOX
+ state = NORMAL
+ detail = "spinbutton_down"
+ recolorable = FALSE
+ file = "spin_down_normal.png"
+ border = { 6, 4, 3, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ detail = "spinbutton_down"
+ recolorable = FALSE
+ file = "spin_down_prelight.png"
+ border = { 6, 4, 3, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ detail = "spinbutton_down"
+ recolorable = FALSE
+ file = "spin_down_inactive.png"
+ border = { 6, 4, 3, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ detail = "spinbutton_down"
+ recolorable = FALSE
+ file = "spin_down_active.png"
+ border = { 6, 4, 3, 3 }
+ stretch = TRUE
+ overlay_file = "null.png"
+ overlay_stretch = FALSE
}
}
}
@@ -928,21 +928,21 @@ style "calf-menubar"
style "calf-menu-separator" = "menu"
{
engine "pixmap" {
- image
- {
- function = VLINE
- recolorable = FALSE
- file = "vline.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = HLINE
- recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
+ image
+ {
+ function = VLINE
+ recolorable = FALSE
+ file = "vline.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
}
}
}
@@ -958,101 +958,101 @@ style "calf-menu-separator" = "menu"
style "calf-scale-small" = "calf-default"
{
- GtkVScale::slider_length = 38
- GtkVScale::slider_width = 25
- GtkHScale::slider_length = 38
+ GtkVScale::slider_length = 38
+ GtkVScale::slider_width = 25
+ GtkHScale::slider_length = 38
GtkHScale::slider_width = 25
- engine "pixmap"
- {
- image
- {
- function = BOX
- file = "trough1-horizontal.png"
- border = { 14, 14, 0, 0 }
- stretch = TRUE
+ engine "pixmap"
+ {
+ image
+ {
+ function = BOX
+ file = "trough1-horizontal.png"
+ border = { 14, 14, 0, 0 }
+ stretch = TRUE
orientation = HORIZONTAL
- }
- image
- {
- function = BOX
- file = "trough1-vertical.png"
- border = { 0, 0, 14, 14 }
- stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ file = "trough1-vertical.png"
+ border = { 0, 0, 14, 14 }
+ stretch = TRUE
+ orientation = VERTICAL
+ }
+
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = NORMAL
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-horiz.png"
+ overlay_stretch = FALSE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-horiz-prelight.png"
+ overlay_stretch = FALSE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-horiz.png"
+ overlay_stretch = FALSE
+ orientation = HORIZONTAL
+ }
+
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = NORMAL
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-vert.png"
+ overlay_stretch = FALSE
+ orientation = VERTICAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-vert-prelight.png"
+ overlay_stretch = FALSE
+ orientation = VERTICAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider1-vert.png"
+ overlay_stretch = FALSE
orientation = VERTICAL
- }
-
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = NORMAL
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-horiz.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = PRELIGHT
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-horiz-prelight.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = INSENSITIVE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-horiz.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
-
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = NORMAL
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-vert.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = PRELIGHT
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-vert-prelight.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = INSENSITIVE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider1-vert.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
}
}
}
@@ -1060,97 +1060,97 @@ style "calf-scale-small" = "calf-default"
style "calf-scale-big" = "calf-default"
{
- engine "pixmap"
- {
- image
- {
- function = BOX
- file = "trough2-horizontal.png"
- border = { 20, 20, 0, 0 }
- stretch = TRUE
+ engine "pixmap"
+ {
+ image
+ {
+ function = BOX
+ file = "trough2-horizontal.png"
+ border = { 20, 20, 0, 0 }
+ stretch = TRUE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = BOX
+ file = "trough2-vertical.png"
+ border = { 0, 0, 20, 20 }
+ stretch = TRUE
+ orientation = VERTICAL
+ }
+
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = NORMAL
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-horiz.png"
+ overlay_stretch = FALSE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-horiz-prelight.png"
+ overlay_stretch = FALSE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-horiz.png"
+ overlay_stretch = FALSE
orientation = HORIZONTAL
- }
- image
- {
- function = BOX
- file = "trough2-vertical.png"
- border = { 0, 0, 20, 20 }
- stretch = TRUE
+ }
+
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = NORMAL
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-vert.png"
+ overlay_stretch = FALSE
+ orientation = VERTICAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-vert-prelight.png"
+ overlay_stretch = FALSE
+ orientation = VERTICAL
+ }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider2-vert.png"
+ overlay_stretch = FALSE
orientation = VERTICAL
- }
-
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = NORMAL
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-horiz.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = PRELIGHT
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-horiz-prelight.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = INSENSITIVE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-horiz.png"
- overlay_stretch = FALSE
- orientation = HORIZONTAL
- }
-
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = NORMAL
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-vert.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = PRELIGHT
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-vert-prelight.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
- }
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = INSENSITIVE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider2-vert.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
}
}
}
@@ -1475,132 +1475,132 @@ style "calf-container"
style "calf-notebook"
{
GtkNotebook::tab-overlap = -2
- xthickness = 18
+ xthickness = 18
ythickness = 10
- engine "pixmap"
- {
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_bottom_normal.png"
- border = { 24, 24, 0, 19 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_top_normal.png"
- border = { 24, 24, 19, 0 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_left_normal.png"
- border = { 19, 0, 24, 24 }
- stretch = TRUE
- gap_side = RIGHT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_right_normal.png"
- border = { 0, 19, 24, 24 }
- stretch = TRUE
- gap_side = LEFT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_top_prelight.png"
- border = { 24, 24, 19, 0 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_bottom_prelight.png"
- border = { 24, 24, 0, 19 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_left_prelight.png"
- border = { 19, 0, 24, 24 }
- stretch = TRUE
- gap_side = RIGHT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_right_prelight.png"
- border = { 0, 19, 24, 24 }
- stretch = TRUE
- gap_side = LEFT
+ engine "pixmap"
+ {
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_bottom_normal.png"
+ border = { 24, 24, 0, 19 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_top_normal.png"
+ border = { 24, 24, 19, 0 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_left_normal.png"
+ border = { 19, 0, 24, 24 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_right_normal.png"
+ border = { 0, 19, 24, 24 }
+ stretch = TRUE
+ gap_side = LEFT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_top_prelight.png"
+ border = { 24, 24, 19, 0 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_bottom_prelight.png"
+ border = { 24, 24, 0, 19 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_left_prelight.png"
+ border = { 19, 0, 24, 24 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_right_prelight.png"
+ border = { 0, 19, 24, 24 }
+ stretch = TRUE
+ gap_side = LEFT
}
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_top.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_bottom.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_left.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = LEFT
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_right.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = RIGHT
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- }
- }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_top.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_bottom.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_left.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = LEFT
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_right.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ }
+ }
}
diff --git a/gui/tubeH1.png b/gui/tubeH1.png
index 3625d39..fc45ed2 100644
Binary files a/gui/tubeH1.png and b/gui/tubeH1.png differ
diff --git a/gui/tubeH2.png b/gui/tubeH2.png
index 864bcc9..306bf58 100644
Binary files a/gui/tubeH2.png and b/gui/tubeH2.png differ
diff --git a/src/ctl_led.cpp b/src/ctl_led.cpp
index 9dbeaf4..cfc1144 100644
--- a/src/ctl_led.cpp
+++ b/src/ctl_led.cpp
@@ -65,35 +65,19 @@ calf_led_expose (GtkWidget *widget, GdkEventExpose *event)
// }
cairo_paint(cache_cr);
- // outer (light)
+ // outer (black)
pad = 0;
- rad = 6;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
- cairo_pattern_add_color_stop_rgba (pat2, 0, 0, 0, 0, 0.3);
- cairo_pattern_add_color_stop_rgba (pat2, 1, 1, 1, 1, 0.6);
- cairo_set_source (cache_cr, pat2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_set_source_rgb(cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
- // inner (black)
+ // inner (bevel)
pad = 1;
- rad = 5;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
cairo_pattern_add_color_stop_rgba (pat2, 0, 0.23, 0.23, 0.23, 1);
cairo_pattern_add_color_stop_rgba (pat2, 0.5, 0, 0, 0, 1);
cairo_set_source (cache_cr, pat2);
- //cairo_set_source_rgb(cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
cairo_rectangle(cache_cr, ox, oy, sx, sy);
diff --git a/src/ctl_vumeter.cpp b/src/ctl_vumeter.cpp
index 3c65dcd..ccd3877 100644
--- a/src/ctl_vumeter.cpp
+++ b/src/ctl_vumeter.cpp
@@ -30,35 +30,25 @@
///////////////////////////////////////// vu meter ///////////////////////////////////////////////
static void
-calf_vumeter_draw_outline_part (cairo_t *c, int pad, int rad, int ix, int iy, int ox, int oy, int sx, int sy)
+calf_vumeter_draw_outline_part (cairo_t *c, int pad, int ix, int iy, int ox, int oy, int sx, int sy)
{
- cairo_arc(c, ix + rad + pad, iy + rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(c, ix + ox * 2 + sx - rad - pad, iy + rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(c, ix + rad + pad, iy + oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(c, ix + ox * 2 + sx - rad - pad, iy + oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(c, ix + pad, iy + rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(c, ix + rad + pad, iy + pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_rectangle(c, ix + pad, iy + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
}
static void
calf_vumeter_draw_outline (cairo_t *c, int ix, int iy, int ox, int oy, int sx, int sy)
{
- // outer (light)
- calf_vumeter_draw_outline_part (c, 0, 6, ix, iy, ox, oy, sx, sy);
- cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - 0 * 2);
- cairo_pattern_add_color_stop_rgba (pat2, 0, 0, 0, 0, 0.3);
- cairo_pattern_add_color_stop_rgba (pat2, 1, 1, 1, 1, 0.6);
- cairo_set_source (c, pat2);
+ // outer (black)
+ calf_vumeter_draw_outline_part (c, 0, ix, iy, ox, oy, sx, sy);
+ cairo_set_source_rgb(c, 0, 0, 0);
cairo_fill(c);
- cairo_pattern_destroy(pat2);
- // inner (black)
- calf_vumeter_draw_outline_part (c, 1, 5, ix, iy, ox, oy, sx, sy);
- pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - 1 * 2);
+ // inner (bevel)
+ calf_vumeter_draw_outline_part (c, 1, ix, iy, ox, oy, sx, sy);
+ cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - 1 * 2);
cairo_pattern_add_color_stop_rgba (pat2, 0, 0.23, 0.23, 0.23, 1);
cairo_pattern_add_color_stop_rgba (pat2, 0.5, 0, 0, 0, 1);
cairo_set_source (c, pat2);
- //cairo_set_source_rgb(c, 0, 0, 0);
cairo_fill(c);
cairo_pattern_destroy(pat2);
}
@@ -76,7 +66,8 @@ calf_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
int mx = vu->meter_width;
if (mx > widget->allocation.width / 2)
mx = 0;
- int sx = widget->allocation.width - (ox * 2) - ((widget->allocation.width - inner * 2 - ox * 2) % led) - 1 - mx, sy = widget->allocation.height - (oy * 2);
+ int sx = widget->allocation.width - (ox * 2), sy = widget->allocation.height - (oy * 2);
+ int sx1 = sx - ((widget->allocation.width - inner * 2 - ox * 2) % led) - 1 - mx;
style = gtk_widget_get_style(widget);
cairo_t *c = gdk_cairo_create(GDK_DRAWABLE(widget->window));
if( vu->cache_surface == NULL ) {
@@ -102,6 +93,8 @@ calf_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
calf_vumeter_draw_outline (cache_cr, 0, 0, ox, oy, sx, sy);
+ sx = sx1;
+
cairo_rectangle(cache_cr, ox, oy, sx, sy);
cairo_set_source_rgb (cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
@@ -153,6 +146,8 @@ calf_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
cairo_pattern_add_color_stop_rgba (vu->pat, 1, 0, 0, 0, 0.6);
cairo_destroy( cache_cr );
}
+
+ sx = sx1;
cairo_set_source_surface( c, vu->cache_surface, 0,0 );
cairo_paint( c );
diff --git a/src/custom_ctl.cpp b/src/custom_ctl.cpp
index f3c218c..52dd523 100644
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@ -102,7 +102,7 @@ calf_line_graph_expose (GtkWidget *widget, GdkEventExpose *event)
CalfLineGraph *lg = CALF_LINE_GRAPH(widget);
//int ox = widget->allocation.x + 1, oy = widget->allocation.y + 1;
- int ox = 5, oy = 5, rad, pad;
+ int ox = 5, oy = 5, pad;
int sx = widget->allocation.width - ox * 2, sy = widget->allocation.height - oy * 2;
cairo_t *c = gdk_cairo_create(GDK_DRAWABLE(widget->window));
@@ -161,31 +161,16 @@ calf_line_graph_expose (GtkWidget *widget, GdkEventExpose *event)
// }
cairo_paint(cache_cr);
- // outer (light)
+ // outer (black)
pad = 0;
- rad = 6;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
- cairo_pattern_add_color_stop_rgba (pat2, 0, 0, 0, 0, 0.3);
- cairo_pattern_add_color_stop_rgba (pat2, 1, 1, 1, 1, 0.6);
- cairo_set_source (cache_cr, pat2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_set_source_rgb(cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
- // inner (black)
+ // inner (bevel)
pad = 1;
- rad = 5;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
cairo_pattern_add_color_stop_rgba (pat2, 0, 0.23, 0.23, 0.23, 1);
cairo_pattern_add_color_stop_rgba (pat2, 0.5, 0, 0, 0, 1);
cairo_set_source (cache_cr, pat2);
@@ -906,35 +891,19 @@ calf_tube_expose (GtkWidget *widget, GdkEventExpose *event)
// }
cairo_paint(cache_cr);
- // outer (light)
+ // outer (black)
pad = 0;
- rad = 6;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
- cairo_pattern_add_color_stop_rgba (pat2, 0, 0, 0, 0, 0.3);
- cairo_pattern_add_color_stop_rgba (pat2, 1, 1, 1, 1, 0.6);
- cairo_set_source (cache_cr, pat2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_set_source_rgb(cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
- // inner (black)
+ // inner (bevel)
pad = 1;
- rad = 5;
- cairo_arc(cache_cr, rad + pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, rad + pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, rad + pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_arc(cache_cr, ox * 2 + sx - rad - pad, oy * 2 + sy - rad - pad, rad, 0, 2 * M_PI);
- cairo_rectangle(cache_cr, pad, rad + pad, sx + ox * 2 - pad * 2, sy + oy * 2 - rad * 2 - pad * 2);
- cairo_rectangle(cache_cr, rad + pad, pad, sx + ox * 2 - rad * 2 - pad * 2, sy + oy * 2 - pad * 2);
- pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
+ cairo_rectangle(cache_cr, pad, pad, sx + ox * 2 - pad * 2, sy + oy * 2 - pad * 2);
+ cairo_pattern_t *pat2 = cairo_pattern_create_linear (0, 0, 0, sy + oy * 2 - pad * 2);
cairo_pattern_add_color_stop_rgba (pat2, 0, 0.23, 0.23, 0.23, 1);
cairo_pattern_add_color_stop_rgba (pat2, 0.5, 0, 0, 0, 1);
cairo_set_source (cache_cr, pat2);
- //cairo_set_source_rgb(cache_cr, 0, 0, 0);
cairo_fill(cache_cr);
cairo_pattern_destroy(pat2);
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list