nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using extended fluxbox menutheme instead of fbtk menutheme

Browse source
This commit is contained in:
fluxgen 2003-07-10 11:29:45 +00:00
parent 876e6f7dfc
commit 6e416d3e40
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.201 2003/07/04 01:03:40 rathnor Exp $ // $Id: Screen.cc,v 1.202 2003/07/10 11:29:45 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -56,6 +56,7 @@
#include "Strut.hh" #include "Strut.hh"
#include "SlitTheme.hh" #include "SlitTheme.hh"
#include "CommandParser.hh" #include "CommandParser.hh"
#include "MenuTheme.hh"
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -287,7 +288,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
// because winbutton need to rescale the pixmaps in winbutton theme // because winbutton need to rescale the pixmaps in winbutton theme
// after fbwinframe have resized them // after fbwinframe have resized them
m_winbutton_theme(new WinButtonTheme(scrn)), m_winbutton_theme(new WinButtonTheme(scrn)),
m_menutheme(new FbTk::MenuTheme(scrn)), m_menutheme(new MenuTheme(scrn)),
m_root_theme(new m_root_theme(new
RootTheme(scrn, RootTheme(scrn,
*resource.rootcommand)), *resource.rootcommand)),
@ -1049,7 +1050,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
win = winclient->fbwindow(); win = winclient->fbwindow();
else { else {
win = new FluxboxWindow(*winclient, *this, win = new FluxboxWindow(*winclient, *this,
winFrameTheme(), *menuTheme(), winFrameTheme(),
*layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
new_win = true; new_win = true;
@ -1093,7 +1094,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
FluxboxWindow *BScreen::createWindow(WinClient &client) { FluxboxWindow *BScreen::createWindow(WinClient &client) {
FluxboxWindow *win = new FluxboxWindow(client, *this, FluxboxWindow *win = new FluxboxWindow(client, *this,
winFrameTheme(), *menuTheme(), winFrameTheme(),
*layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
#ifdef SLIT #ifdef SLIT
if (win->initialState() == WithdrawnState) if (win->initialState() == WithdrawnState)

10
src/Screen.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.hh,v 1.113 2003/07/01 12:39:09 fluxgen Exp $ // $Id: Screen.hh,v 1.114 2003/07/10 11:28:24 fluxgen Exp $
#ifndef SCREEN_HH #ifndef SCREEN_HH
#define SCREEN_HH #define SCREEN_HH
@ -33,6 +33,7 @@
#include "FbRootWindow.hh" #include "FbRootWindow.hh"
#include "NotCopyable.hh" #include "NotCopyable.hh"
#include "fluxbox.hh" #include "fluxbox.hh"
#include "MenuTheme.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
@ -54,7 +55,6 @@ class Strut;
class Slit; class Slit;
namespace FbTk { namespace FbTk {
class MenuTheme;
class Menu; class Menu;
class ImageControl; class ImageControl;
class XLayerItem; class XLayerItem;
@ -190,8 +190,8 @@ public:
inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); } inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); }
inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); } inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); }
inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); } inline MenuTheme *menuTheme() { return m_menutheme.get(); }
inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); } inline const MenuTheme *menuTheme() const { return m_menutheme.get(); }
inline const RootTheme &rootTheme() const { return *m_root_theme.get(); } inline const RootTheme &rootTheme() const { return *m_root_theme.get(); }
FbRootWindow &rootWindow() { return m_root_window; } FbRootWindow &rootWindow() { return m_root_window; }
const FbRootWindow &rootWindow() const { return m_root_window; } const FbRootWindow &rootWindow() const { return m_root_window; }
@ -383,7 +383,7 @@ private:
std::auto_ptr<FbWinFrameTheme> m_windowtheme; std::auto_ptr<FbWinFrameTheme> m_windowtheme;
std::auto_ptr<WinButtonTheme> m_winbutton_theme; std::auto_ptr<WinButtonTheme> m_winbutton_theme;
std::auto_ptr<FbTk::MenuTheme> m_menutheme; std::auto_ptr<MenuTheme> m_menutheme;
std::auto_ptr<RootTheme> m_root_theme; std::auto_ptr<RootTheme> m_root_theme;
FbRootWindow m_root_window; FbRootWindow m_root_window;