aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-07 10:26:32 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-07 10:26:32 (GMT)
commitdbfddf8e0bcf8e7abbba671eff64c9679332a774 (patch)
tree37cefce75eef2f7e0c749c3489008608e71dcd6c /src/Screen.cc
parentac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (diff)
downloadfluxbox_pavel-dbfddf8e0bcf8e7abbba671eff64c9679332a774.zip
fluxbox_pavel-dbfddf8e0bcf8e7abbba671eff64c9679332a774.tar.bz2
added new ThemeProxy for automatically handling focused vs. unfocused ThemeItems
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 5edbcaf..7174cda 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1795,7 +1795,7 @@ void BScreen::showPosition(int x, int y) {
1795 1795
1796 winFrameTheme()->font().drawText(m_pos_window, 1796 winFrameTheme()->font().drawText(m_pos_window,
1797 screenNumber(), 1797 screenNumber(),
1798 winFrameTheme()->iconbarTheme().focusedText().textGC(), 1798 winFrameTheme()->focusedIconbarTheme().text().textGC(),
1799 label, strlen(label), 1799 label, strlen(label),
1800 winFrameTheme()->bevelWidth(), 1800 winFrameTheme()->bevelWidth(),
1801 winFrameTheme()->bevelWidth() + 1801 winFrameTheme()->bevelWidth() +
@@ -1847,7 +1847,7 @@ void BScreen::showGeometry(int gx, int gy) {
1847 //!! TODO: geom window again?! repeated 1847 //!! TODO: geom window again?! repeated
1848 winFrameTheme()->font().drawText(m_geom_window, 1848 winFrameTheme()->font().drawText(m_geom_window,
1849 screenNumber(), 1849 screenNumber(),
1850 winFrameTheme()->iconbarTheme().focusedText().textGC(), 1850 winFrameTheme()->focusedIconbarTheme().text().textGC(),
1851 label, strlen(label), 1851 label, strlen(label),
1852 winFrameTheme()->bevelWidth(), 1852 winFrameTheme()->bevelWidth(),
1853 winFrameTheme()->bevelWidth() + 1853 winFrameTheme()->bevelWidth() +
@@ -1918,7 +1918,7 @@ void BScreen::renderGeomWindow() {
1918 1918
1919 Pixmap tmp = geom_pixmap; 1919 Pixmap tmp = geom_pixmap;
1920 1920
1921 if (winFrameTheme()->iconbarTheme().focusedTexture().type() & FbTk::Texture::PARENTRELATIVE) { 1921 if (winFrameTheme()->focusedIconbarTheme().texture().type() & FbTk::Texture::PARENTRELATIVE) {
1922 if (!winFrameTheme()->titleFocusTexture().usePixmap()) { 1922 if (!winFrameTheme()->titleFocusTexture().usePixmap()) {
1923 geom_pixmap = None; 1923 geom_pixmap = None;
1924 m_geom_window.setBackgroundColor(winFrameTheme()->titleFocusTexture().color()); 1924 m_geom_window.setBackgroundColor(winFrameTheme()->titleFocusTexture().color());
@@ -1928,12 +1928,12 @@ void BScreen::renderGeomWindow() {
1928 m_geom_window.setBackgroundPixmap(geom_pixmap); 1928 m_geom_window.setBackgroundPixmap(geom_pixmap);
1929 } 1929 }
1930 } else { 1930 } else {
1931 if (!winFrameTheme()->iconbarTheme().focusedTexture().usePixmap()) { 1931 if (!winFrameTheme()->focusedIconbarTheme().texture().usePixmap()) {
1932 geom_pixmap = None; 1932 geom_pixmap = None;
1933 m_geom_window.setBackgroundColor(winFrameTheme()->iconbarTheme().focusedTexture().color()); 1933 m_geom_window.setBackgroundColor(winFrameTheme()->focusedIconbarTheme().texture().color());
1934 } else { 1934 } else {
1935 geom_pixmap = imageControl().renderImage(m_geom_window.width(), m_geom_window.height(), 1935 geom_pixmap = imageControl().renderImage(m_geom_window.width(), m_geom_window.height(),
1936 winFrameTheme()->iconbarTheme().focusedTexture()); 1936 winFrameTheme()->focusedIconbarTheme().texture());
1937 m_geom_window.setBackgroundPixmap(geom_pixmap); 1937 m_geom_window.setBackgroundPixmap(geom_pixmap);
1938 } 1938 }
1939 } 1939 }
@@ -1956,7 +1956,7 @@ void BScreen::renderPosWindow() {
1956 1956
1957 Pixmap tmp = pos_pixmap; 1957 Pixmap tmp = pos_pixmap;
1958 1958
1959 if (winFrameTheme()->iconbarTheme().focusedTexture().type() & FbTk::Texture::PARENTRELATIVE) { 1959 if (winFrameTheme()->focusedIconbarTheme().texture().type() & FbTk::Texture::PARENTRELATIVE) {
1960 if (!winFrameTheme()->titleFocusTexture().usePixmap()) { 1960 if (!winFrameTheme()->titleFocusTexture().usePixmap()) {
1961 pos_pixmap = None; 1961 pos_pixmap = None;
1962 m_pos_window.setBackgroundColor(winFrameTheme()->titleFocusTexture().color()); 1962 m_pos_window.setBackgroundColor(winFrameTheme()->titleFocusTexture().color());
@@ -1966,12 +1966,12 @@ void BScreen::renderPosWindow() {
1966 m_pos_window.setBackgroundPixmap(pos_pixmap); 1966 m_pos_window.setBackgroundPixmap(pos_pixmap);
1967 } 1967 }
1968 } else { 1968 } else {
1969 if (!winFrameTheme()->iconbarTheme().focusedTexture().usePixmap()) { 1969 if (!winFrameTheme()->focusedIconbarTheme().texture().usePixmap()) {
1970 pos_pixmap = None; 1970 pos_pixmap = None;
1971 m_pos_window.setBackgroundColor(winFrameTheme()->iconbarTheme().focusedTexture().color()); 1971 m_pos_window.setBackgroundColor(winFrameTheme()->focusedIconbarTheme().texture().color());
1972 } else { 1972 } else {
1973 pos_pixmap = imageControl().renderImage(m_pos_window.width(), m_pos_window.height(), 1973 pos_pixmap = imageControl().renderImage(m_pos_window.width(), m_pos_window.height(),
1974 winFrameTheme()->iconbarTheme().focusedTexture()); 1974 winFrameTheme()->focusedIconbarTheme().texture());
1975 m_pos_window.setBackgroundPixmap(pos_pixmap); 1975 m_pos_window.setBackgroundPixmap(pos_pixmap);
1976 } 1976 }
1977 } 1977 }