Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now maintains the state of the undo/redo menu items.

Browse Source 
Fixed the size limits when the view is buried a bit deeper in the hierarchy.
Tried to disable the slider when it's of no use, but it has no effect...


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6735 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-02-24 16:59:15 +00:00
parent 4886c973ab
commit d426c2b9ea
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/apps/diskprobe/ProbeView.cpp
View File

@ -352,6 +352,8 @@ PositionSlider::SetSize(off_t size)
if (size == fSize) if (size == fSize)
return; return;
SetEnabled(fSize > fBlockSize);
off_t position = Position(); off_t position = Position();
if (position >= size) if (position >= size)
position = size - 1; position = size - 1;
@ -880,8 +882,10 @@ ProbeView::UpdateSizeLimits()
float width, height; float width, height;
fDataView->GetPreferredSize(&width, &height); fDataView->GetPreferredSize(&width, &height);
BRect frame = Window()->ConvertFromScreen(ConvertToScreen(fHeaderView->Frame()));
Window()->SetSizeLimits(200, width + B_V_SCROLL_BAR_WIDTH, Window()->SetSizeLimits(200, width + B_V_SCROLL_BAR_WIDTH,
200, height + fHeaderView->Frame().bottom + 4 + B_H_SCROLL_BAR_HEIGHT + Frame().top); 200, height + frame.bottom + 4 + B_H_SCROLL_BAR_HEIGHT);
} }
@ -997,8 +1001,12 @@ ProbeView::AttachedToWindow()
BMenu *menu = new BMenu("Edit"); BMenu *menu = new BMenu("Edit");
BMenuItem *item; BMenuItem *item;
menu->AddItem(new BMenuItem("Undo", NULL, 'Z', B_COMMAND_KEY)); menu->AddItem(fUndoMenuItem = new BMenuItem("Undo", new BMessage(B_UNDO), 'Z', B_COMMAND_KEY));
menu->AddItem(new BMenuItem("Redo", NULL, 'Z', B_COMMAND_KEY | B_SHIFT_KEY)); fUndoMenuItem->SetEnabled(fEditor.CanUndo());
fUndoMenuItem->SetTarget(fDataView);
menu->AddItem(fRedoMenuItem = new BMenuItem("Redo", new BMessage(B_REDO), 'Z', B_COMMAND_KEY | B_SHIFT_KEY));
fRedoMenuItem->SetEnabled(fEditor.CanRedo());
fRedoMenuItem->SetTarget(fDataView);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(item = new BMenuItem("Copy", new BMessage(B_COPY), 'C', B_COMMAND_KEY)); menu->AddItem(item = new BMenuItem("Copy", new BMessage(B_COPY), 'C', B_COMMAND_KEY));
item->SetTarget(fDataView); item->SetTarget(fDataView);
@ -1182,6 +1190,17 @@ ProbeView::MessageReceived(BMessage *message)
CheckClipboard(); CheckClipboard();
break; break;
case kMsgDataEditorStateChange:
{
bool enabled;
if (message->FindBool("can_undo", &enabled) == B_OK)
fUndoMenuItem->SetEnabled(enabled);
if (message->FindBool("can_redo", &enabled) == B_OK)
fRedoMenuItem->SetEnabled(enabled);
break;
}
default: default:
BView::MessageReceived(message); BView::MessageReceived(message);
} }

3
src/apps/diskprobe/ProbeView.h
View File

@ -37,6 +37,8 @@ class ProbeView : public BView {
void UpdateSizeLimits(); void UpdateSizeLimits();
DataEditor &Editor() { return fEditor; }
private: private:
void UpdateAttributesMenu(BMenu *menu); void UpdateAttributesMenu(BMenu *menu);
void CheckClipboard(); void CheckClipboard();
@ -47,6 +49,7 @@ class ProbeView : public BView {
DataView *fDataView; DataView *fDataView;
BScrollView *fScrollView; BScrollView *fScrollView;
BMenuItem *fPasteMenuItem; BMenuItem *fPasteMenuItem;
BMenuItem *fUndoMenuItem, *fRedoMenuItem;
}; };
#endif /* PROBE_VIEW_H */ #endif /* PROBE_VIEW_H */