i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small changes

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8399 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2004-07-14 22:52:48 +00:00
parent 866cadc287
commit bb14a500e6
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prefs/keymap/KeymapWindow.cpp
+15 -13
View File
@@ -191,11 +191,10 @@ KeymapWindow::AddMaps(BView *placeholderView)
if( currentKeymapItem != NULL ) if( currentKeymapItem != NULL )
fUserListView->AddItem( currentKeymapItem ); fUserListView->AddItem( currentKeymapItem );
// Saved keymaps // Saved keymaps
mapsBox->AddChild( new BScrollView( "systemScrollList", fUserListView, mapsBox->AddChild( new BScrollView( "userScrollList", fUserListView,
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true )); B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true ));
fUserListView->SetSelectionMessage( new BMessage( USER_MAP_SELECTED )); fUserListView->SetSelectionMessage( new BMessage( USER_MAP_SELECTED ));
FillSystemMaps(); FillSystemMaps();
FillUserMaps(); FillUserMaps();
@@ -350,6 +349,17 @@ MapView::MapView(BRect rect, const char *name, Keymap* keymap)
fCurrentFont(*be_plain_font), fCurrentFont(*be_plain_font),
fCurrentMap(keymap) fCurrentMap(keymap)
{ {
BRect frameRect = BRect(14, 16, Bounds().right-12, 30);
BRect textRect = frameRect;
textRect.OffsetTo(B_ORIGIN);
textRect.InsetBy(1,1);
fTextView = new KeymapTextView(frameRect, "testzone", textRect,
B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS);
fTextView->MakeEditable(true);
fTextView->MakeSelectable(true);
AddChild(fTextView);
BRect keyRect = BRect(11,50,29,68); BRect keyRect = BRect(11,50,29,68);
int32 i = 1; int32 i = 1;
fKeysRect[i] = keyRect; fKeysRect[i] = keyRect;
@@ -705,16 +715,7 @@ MapView::MapView(BRect rect, const char *name, Keymap* keymap)
fKeysVertical[0x5e] = true; fKeysVertical[0x5e] = true;
BRect frameRect = BRect(14, 16, Bounds().right-12, 30);
BRect textRect = frameRect;
textRect.OffsetTo(B_ORIGIN);
textRect.InsetBy(1,1);
fTextView = new KeymapTextView(frameRect, "testzone", textRect,
B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS);
fTextView->MakeEditable(true);
fTextView->MakeSelectable(true);
fTextView->SetViewColor(255,255,255);
AddChild(fTextView);
} }
@@ -723,6 +724,7 @@ void
MapView::AttachedToWindow() MapView::AttachedToWindow()
{ {
SetEventMask(B_KEYBOARD_EVENTS, B_NO_POINTER_HISTORY); SetEventMask(B_KEYBOARD_EVENTS, B_NO_POINTER_HISTORY);
fTextView->SetViewColor(255,255,255);
} }
src/prefs/keymap/KeymapWindow.h
+2 -3
View File
@@ -16,9 +16,8 @@
#ifndef KEYMAP_WINDOW_H #ifndef KEYMAP_WINDOW_H
#define KEYMAP_WINDOW_H #define KEYMAP_WINDOW_H
#include <interface/Window.h> #include <Window.h>
#include <support/List.h> #include <MenuBar.h>
#include <interface/MenuBar.h>
#include "KeymapTextView.h" #include "KeymapTextView.h"
#include "Keymap.h" #include "Keymap.h"